Commit ba1de166 authored by unknown's avatar unknown
Browse files

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

into  chilla.local:/home/mydev/mysql-5.0-axmrg
parents 9d66be72 daf7790c

mysql-test/r/keywords.result

+13 −0
Original line number Diff line number Diff line
@@ -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;

mysql-test/t/keywords.test

+22 −0
Original line number Diff line number Diff line
@@ -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

mysys/my_thr_init.c

+2 −0
Original line number Diff line number Diff line
@@ -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 */



/*

sql/sql_yacc.yy

+1 −0
Original line number Diff line number Diff line
@@ -7926,6 +7926,7 @@ keyword_sp: 
	| COMPACT_SYM		{}

	| COMPRESSED_SYM	{}

	| CONCURRENT		{}

	| CONNECTION_SYM	{}

	| CONSISTENT_SYM	{}

	| CUBE_SYM		{}

	| DATA_SYM		{}