bk commit into 5.1 tree (acurtis:1.2246) BUG#19939

[antony]

Below is the list of changes that have just been committed into a local
5.1 repository of antony. When antony does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2246 06/07/11 15:14:19 acurtis@stripped +3 -0
  Bug#19939
    AUTHORS and CONTRIBUTORS are not reserved keywords.

  sql/sql_yacc.yy
    1.485 06/07/11 15:14:09 acurtis@stripped +2 -1
    Bug#19939
      AUTHORS and CONTRIBUTORS are not reserved keywords.

  mysql-test/t/keywords.test
    1.8 06/07/11 15:14:09 acurtis@stripped +24 -0
    Bug#19939
      Test for bug

  mysql-test/r/keywords.result
    1.8 06/07/11 15:14:09 acurtis@stripped +16 -0
    Bug#19939
      Test for bug

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	acurtis
# Host:	ltantony.xiphis.org
# Root:	/home/antony/work2/p3-bug19939.3

--- 1.484/sql/sql_yacc.yy	2006-06-26 07:44:38 -07:00
+++ 1.485/sql/sql_yacc.yy	2006-07-11 15:14:09 -07:00
@@ -9291,7 +9291,6 @@ user:
 keyword:
 	keyword_sp		{}
 	| ASCII_SYM		{}
-	| AUTHORS_SYM		{}
 	| BACKUP_SYM		{}
 	| BEGIN_SYM		{}
 	| BYTE_SYM		{}
@@ -9349,6 +9348,7 @@ keyword_sp:
 	| ALGORITHM_SYM		{}
 	| ANY_SYM		{}
 	| AT_SYM                {}
+	| AUTHORS_SYM		{}
 	| AUTO_INC		{}
 	| AUTOEXTEND_SIZE_SYM   {}
 	| AVG_ROW_LENGTH	{}
@@ -9374,6 +9374,7 @@ keyword_sp:
 	| COMPRESSED_SYM	{}
 	| CONCURRENT		{}
 	| CONSISTENT_SYM	{}
+	| CONTRIBUTORS_SYM	{}
 	| CUBE_SYM		{}
 	| DATA_SYM		{}
 	| DATAFILE_SYM          {}

--- 1.7/mysql-test/r/keywords.result	2003-12-08 02:40:57 -08:00
+++ 1.8/mysql-test/r/keywords.result	2006-07-11 15:14:09 -07:00
@@ -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;

--- 1.7/mysql-test/t/keywords.test	2005-07-28 06:12:34 -07:00
+++ 1.8/mysql-test/t/keywords.test	2006-07-11 15:14:09 -07:00
@@ -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