diff options
| -rw-r--r-- | mysql-test/r/keywords.result | 13 | ||||
| -rw-r--r-- | mysql-test/t/keywords.test | 22 | ||||
| -rw-r--r-- | mysys/my_thr_init.c | 2 | ||||
| -rw-r--r-- | sql/sql_yacc.yy | 1 |
4 files changed, 38 insertions, 0 deletions
diff --git a/mysql-test/r/keywords.result b/mysql-test/r/keywords.result index 88a0ab8abd5..c14ae584c86 100644 --- a/mysql-test/r/keywords.result +++ b/mysql-test/r/keywords.result @@ -16,3 +16,16 @@ 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; diff --git a/mysql-test/t/keywords.test b/mysql-test/t/keywords.test index de0159a950e..46933a230ee 100644 --- a/mysql-test/t/keywords.test +++ b/mysql-test/t/keywords.test @@ -19,3 +19,25 @@ 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); +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 diff --git a/mysys/my_thr_init.c b/mysys/my_thr_init.c index 67ab1e4a38a..abacc7bc004 100644 --- a/mysys/my_thr_init.c +++ b/mysys/my_thr_init.c @@ -47,6 +47,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 */ /* diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy index b4147d2905c..37c591b4f4a 100644 --- a/sql/sql_yacc.yy +++ b/sql/sql_yacc.yy @@ -7926,6 +7926,7 @@ keyword_sp: | COMPACT_SYM {} | COMPRESSED_SYM {} | CONCURRENT {} + | CONNECTION_SYM {} | CONSISTENT_SYM {} | CUBE_SYM {} | DATA_SYM {} |