Commit 97c6a6c4 authored by istruewing@chilla.local's avatar istruewing@chilla.local

Merge bk-internal.mysql.com:/home/bk/mysql-5.0

into  chilla.local:/home/mydev/mysql-5.0-axmrg
parents 154f7f39 f9e9bd9a
......@@ -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;
......@@ -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
......@@ -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 */
/*
......
......@@ -7926,6 +7926,7 @@ keyword_sp:
| COMPACT_SYM {}
| COMPRESSED_SYM {}
| CONCURRENT {}
| CONNECTION_SYM {}
| CONSISTENT_SYM {}
| CUBE_SYM {}
| DATA_SYM {}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment