diff options
author | unknown <antony@ppcg5.local> | 2007-02-08 15:13:54 -0800 |
---|---|---|
committer | unknown <antony@ppcg5.local> | 2007-02-08 15:13:54 -0800 |
commit | 376c602f8ffefa6490a0102df4204aaa3cb5b363 (patch) | |
tree | 4cf6910cbf9eb3c9cd4aae025a62982fa8acae75 /mysql-test/t/keywords.test | |
parent | efc2771dde0c8407ac5b0dd8e83ac58ba8853076 (diff) | |
parent | 6a46b6d6e6a69c152efd10867f101995322d1c8f (diff) | |
download | mariadb-git-376c602f8ffefa6490a0102df4204aaa3cb5b363.tar.gz |
Merge ppcg5.local:/Users/antony/Work/p3-bug12204.4
into ppcg5.local:/Users/antony/Work/p3-bug12204.5
mysys/my_thr_init.c:
Auto merged
sql/sql_yacc.yy:
Auto merged
mysql-test/r/keywords.result:
SCCS merged
mysql-test/t/keywords.test:
SCCS merged
mysys/my_pthread.c:
SCCS merged
Diffstat (limited to 'mysql-test/t/keywords.test')
-rw-r--r-- | mysql-test/t/keywords.test | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/mysql-test/t/keywords.test b/mysql-test/t/keywords.test index 1af4a1354be..afc7fb55d51 100644 --- a/mysql-test/t/keywords.test +++ b/mysql-test/t/keywords.test @@ -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" # |