bk commit into 5.0 tree (gkodinov:1.2261) BUG#21772

[kgeorge]

Below is the list of changes that have just been committed into a local
5.0 repository of kgeorge. When kgeorge 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@stripped, 2006-09-08 13:10:14+03:00, gkodinov@stripped +3 -0
  Bug #21772: can not name a column 'upgrade' when create a table in version 5.0.24
  Upgrade was a reserved word. Unreserve UPGRADE so it can be used in unquoted
identifiers.

  mysql-test/r/create.result@stripped, 2006-09-08 13:10:05+03:00, gkodinov@stripped +2 -0
    Bug #21772: can not name a column 'upgrade' when create a table in version 5.0.24
     - test case

  mysql-test/t/create.test@stripped, 2006-09-08 13:10:06+03:00, gkodinov@stripped +6 -0
    Bug #21772: can not name a column 'upgrade' when create a table in version 5.0.24
     - test case

  sql/sql_yacc.yy@stripped, 2006-09-08 13:10:07+03:00, gkodinov@stripped +1 -0
    Bug #21772: can not name a column 'upgrade' when create a table in version 5.0.24
     - unreserve UPGRADE.

# 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:	gkodinov
# Host:	macbook.gmz
# Root:	/Users/kgeorge/mysql/work/B21772-5.0-opt

--- 1.483/sql/sql_yacc.yy	2006-09-08 13:10:30 +03:00
+++ 1.484/sql/sql_yacc.yy	2006-09-08 13:10:30 +03:00
@@ -7555,6 +7555,7 @@ keyword:
 	| TRUNCATE_SYM		{}
 	| UNICODE_SYM		{}
         | XA_SYM                {}
+        | UPGRADE_SYM           {}
 	;
 
 /*

--- 1.121/mysql-test/r/create.result	2006-09-08 13:10:31 +03:00
+++ 1.122/mysql-test/r/create.result	2006-09-08 13:10:31 +03:00
@@ -773,3 +773,5 @@ Warnings:
 Warning	1071	Specified key was too long; max key length is 765 bytes
 insert into t1 values('aaa');
 drop table t1;
+create table t1 (upgrade int);
+drop table t1;

--- 1.80/mysql-test/t/create.test	2006-09-08 13:10:31 +03:00
+++ 1.81/mysql-test/t/create.test	2006-09-08 13:10:31 +03:00
@@ -674,4 +674,10 @@ create table t1(f1 varchar(800) binary n
 insert into t1 values('aaa');
 drop table t1;
 
+#
+# Bug#21772: can not name a column 'upgrade' when create a table
+#
+create table t1 (upgrade int);
+drop table t1;
+
 # End of 5.0 tests