bk commit into 5.1 tree (antony:1.2424)

[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@stripped, 2007-02-08 15:13:54-08:00, antony@stripped +5 -0
  Merge ppcg5.local:/Users/antony/Work/p3-bug12204.4
  into  ppcg5.local:/Users/antony/Work/p3-bug12204.5
  MERGE: 1.1810.2372.82

  mysql-test/r/keywords.result@stripped, 2007-02-08 15:13:51-08:00, antony@stripped +0 -0
    SCCS merged
    MERGE: 1.7.1.1

  mysql-test/t/keywords.test@stripped, 2007-02-08 15:13:51-08:00, antony@stripped +0 -0
    SCCS merged
    MERGE: 1.7.1.1

  mysys/my_pthread.c@stripped, 2007-02-08 15:13:51-08:00, antony@stripped +0 -0
    SCCS merged
    MERGE: 1.43.1.5

  mysys/my_thr_init.c@stripped, 2007-02-08 15:11:10-08:00, antony@stripped +0 -0
    Auto merged
    MERGE: 1.31.1.8

  sql/sql_yacc.yy@stripped, 2007-02-08 15:11:11-08:00, antony@stripped +0 -0
    Auto merged
    MERGE: 1.371.91.7

# 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.5/RESYNC

--- 1.44/mysys/my_thr_init.c	2007-02-08 15:14:03 -08:00
+++ 1.45/mysys/my_thr_init.c	2007-02-08 15:14:03 -08:00
@@ -46,6 +46,8 @@ pthread_mutexattr_t my_fast_mutexattr;
 pthread_mutexattr_t my_errorcheck_mutexattr;
 #endif
 
+uint thd_lib_detected;
+
 #ifdef NPTL_PTHREAD_EXIT_BUG /* see my_pthread.h */
 
 /*

--- 1.537/sql/sql_yacc.yy	2007-02-08 15:14:03 -08:00
+++ 1.538/sql/sql_yacc.yy	2007-02-08 15:14:03 -08:00
@@ -9667,6 +9667,7 @@ keyword_sp:
 	| COMPLETION_SYM	{}
 	| COMPRESSED_SYM	{}
 	| CONCURRENT		{}
+	| CONNECTION_SYM	{}
 	| CONSISTENT_SYM	{}
 	| CONTRIBUTORS_SYM	{}
 	| CUBE_SYM		{}

--- 1.8/mysql-test/r/keywords.result	2007-02-08 15:14:03 -08:00
+++ 1.9/mysql-test/r/keywords.result	2007-02-08 15:14:03 -08:00
@@ -16,6 +16,19 @@ select events.binlog from events;
 binlog
 1
 drop table events;
+create table t1 (connection int, b int);
+create procedure p1()
+begin
+declare connection int;
+select max(t1.connection) into connection from t1;
+select concat("max=",connection) 'p1';
+end|
+insert into t1 (connection) values (1);
+call p1();
+p1
+max=1
+drop procedure p1;
+drop table t1;
 create procedure p1()
 begin
 declare n int default 2;

--- 1.8/mysql-test/t/keywords.test	2007-02-08 15:14:03 -08:00
+++ 1.9/mysql-test/t/keywords.test	2007-02-08 15:14:03 -08:00
@@ -20,6 +20,28 @@ drop table events;
 
 # End of 4.1 tests
 
+
+#
+# Bug#12204 - CONNECTION should not be a reserved word
+#
+
+create table t1 (connection int, b int);
+delimiter |;
+create procedure p1()
+begin
+  declare connection int;
+  select max(t1.connection) into connection from t1;
+  select concat("max=",connection) 'p1';
+end|
+delimiter ;|
+insert into t1 (connection) values (1);
+call p1();
+drop procedure p1;
+drop table t1;
+
+
+# End of 5.0 tests
+
 #
 # Bug#19939 "AUTHORS is not a keyword"
 #