Commit 376c602f authored by unknown's avatar unknown
Browse files

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
parents efc2771d 6a46b6d6

mysql-test/r/keywords.result

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

mysql-test/t/keywords.test

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

#

mysys/my_thr_init.c

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



/*

sql/sql_yacc.yy

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

	| COMPRESSED_SYM	{}

	| CONCURRENT		{}

	| CONNECTION_SYM	{}

	| CONSISTENT_SYM	{}

	| CONTRIBUTORS_SYM	{}

	| CUBE_SYM		{}