bk commit into 5.0 tree (antony:1.2390) BUG#12204

[antony]

Below is the list of changes that have just been committed into a local
5.0 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@stripped, 2007-01-31 17:00:43-08:00, antony@stripped +3 -0
  Bug#12204
    "CONNECTION is treated as a reserved keyword"
    Allow CONNECTION to be an unreserved keyword.
    Includes test.

  mysql-test/r/keywords.result@stripped, 2007-01-31 17:00:39-08:00, antony@stripped +2 -0
    test for bug 12204

  mysql-test/t/keywords.test@stripped, 2007-01-31 17:00:39-08:00, antony@stripped +10 -0
    test for bug 12204

  sql/sql_yacc.yy@stripped, 2007-01-31 17:00:39-08:00, antony@stripped +1 -0
    allow CONNECTION to be an unreserved keyword

# 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:	antony
# Host:	ppcg5.local
# Root:	/Users/antony/Work/p3-bug12204.1

--- 1.503/sql/sql_yacc.yy	2007-01-31 17:00:50 -08:00
+++ 1.504/sql/sql_yacc.yy	2007-01-31 17:00:50 -08:00
@@ -7859,6 +7859,7 @@ keyword:
 	| CLOSE_SYM		{}
 	| COMMENT_SYM		{}
 	| COMMIT_SYM		{}
+	| CONNECTION_SYM        {}
 	| CONTAINS_SYM          {}
         | DEALLOCATE_SYM        {}
 	| DO_SYM		{}

--- 1.7/mysql-test/r/keywords.result	2007-01-31 17:00:50 -08:00
+++ 1.8/mysql-test/r/keywords.result	2007-01-31 17:00:50 -08:00
@@ -16,3 +16,5 @@ select events.binlog from events;
 binlog
 1
 drop table events;
+create table t1 (connection int, b int);
+drop table t1;

--- 1.7/mysql-test/t/keywords.test	2007-01-31 17:00:50 -08:00
+++ 1.8/mysql-test/t/keywords.test	2007-01-31 17:00:50 -08:00
@@ -19,3 +19,13 @@ select events.binlog from events;
 drop table events;
 
 # End of 4.1 tests
+
+
+#
+# Bug#12204 - CONNECTION should not be a reserved word
+#
+
+create table t1 (connection int, b int);
+drop table t1;
+
+# End of 5.0 tests