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

1 files changed, 13 insertions, 0 deletions

diff --git a/mysql-test/r/keywords.result b/mysql-test/r/keywords.result
index 597983dab7e..e4c83b21138 100644
--- a/mysql-test/r/keywords.result
+++ b/mysql-test/r/keywords.result
@@ -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;