Merge chilla.local:/home/mydev/mysql-5.1-amerge

into  chilla.local:/home/mydev/mysql-5.1-ateam

mysql-test/r/keywords.result

@@ -16,3 +16,19 @@ select events.binlog from events;
 binlog
 1
 drop table events;
+create procedure p1()
+begin
+declare n int default 2;
+authors: while n > 0 do
+set n = n -1;
+end while authors;
+end|
+create procedure p2()
+begin
+declare n int default 2;
+contributors: while n > 0 do
+set n = n -1;
+end while contributors;
+end|
+drop procedure p1;
+drop procedure p2;

mysql-test/t/keywords.test

@@ -19,3 +19,27 @@ select events.binlog from events;
 drop table events;
 
 # End of 4.1 tests
+
+#
+# Bug#19939 "AUTHORS is not a keyword"
+#
+delimiter |;
+create procedure p1()
+begin
+   declare n int default 2;
+   authors: while n > 0 do
+     set n = n -1;
+   end while authors;
+end|
+create procedure p2()
+begin
+   declare n int default 2;
+   contributors: while n > 0 do
+     set n = n -1;
+   end while contributors;
+end|
+delimiter ;|
+drop procedure p1;
+drop procedure p2;
+
+# End of 5.1 tests

sql/sql_yacc.yy

@@ -9317,7 +9317,6 @@ user:
 keyword:
 	keyword_sp		{}
 	| ASCII_SYM		{}
-	| AUTHORS_SYM		{}
 	| BACKUP_SYM		{}
 	| BEGIN_SYM		{}
 	| BYTE_SYM		{}
@@ -9375,6 +9374,7 @@ keyword_sp:
 	| ALGORITHM_SYM		{}
 	| ANY_SYM		{}
 	| AT_SYM                {}
+	| AUTHORS_SYM		{}
 	| AUTO_INC		{}
 	| AUTOEXTEND_SIZE_SYM   {}
 	| AVG_ROW_LENGTH	{}
@@ -9400,6 +9400,7 @@ keyword_sp:
 	| COMPRESSED_SYM	{}
 	| CONCURRENT		{}
 	| CONSISTENT_SYM	{}
+	| CONTRIBUTORS_SYM	{}
 	| CUBE_SYM		{}
 	| DATA_SYM		{}
 	| DATAFILE_SYM          {}