Post-merge fixes.

Multiple result sets from stored procedures now works with the
mysql and mysqltest clients.


client/mysqltest.c:
  Post-merge fixes.
mysql-test/r/index_merge_innodb.result:
  Post-merge fixes.
mysql-test/r/sp-error.result:
  Post-merge fixes.
  Removed now obsolete error test for multiple selects (without "into").
mysql-test/r/sp.result:
  Post-merge fixes.
  Added test for mulple result sets.
mysql-test/r/variables.result:
  Post-merge fixes.
mysql-test/t/index_merge_innodb.test:
  Post-merge fixes.
mysql-test/t/sp-error.test:
  Post-merge fixes.
  Removed now obsolete error test for multiple selects (without "into").
mysql-test/t/sp.test:
  Post-merge fixes.
  Added test for mulple result sets.
sql/lex.h:
  Post-merge fixes.

1 files changed, 42 insertions, 53 deletions

diff --git a/mysql-test/t/sp-error.test b/mysql-test/t/sp-error.test
index ab13559b860..b8b60ac8dde 100644
--- a/mysql-test/t/sp-error.test
+++ b/mysql-test/t/sp-error.test
@@ -32,18 +32,18 @@ create function func1() returns int
   return 42|
 
 # Can't create recursively
---error 1286
+--error 1287
 create procedure foo()
   create procedure bar() set @x=3|
---error 1286
+--error 1287
 create procedure foo()
   create function bar() returns double return 2.3|
 
 # Already exists
---error 1287
+--error 1288
 create procedure proc1()
   set @x = 42|
---error 1287
+--error 1288
 create function func1() returns int
   return 42|
 
@@ -51,39 +51,39 @@ drop procedure proc1|
 drop function func1|
 
 # Does not exist
---error 1288
+--error 1289
 alter procedure foo|
---error 1288
+--error 1289
 alter function foo|
---error 1288
+--error 1289
 drop procedure foo|
---error 1288
+--error 1289
 drop function foo|
---error 1288
+--error 1289
 call foo()|
 drop procedure if exists foo|
---error 1288
+--error 1289
 show create procedure foo|
 
 # LEAVE/ITERATE with no match
---error 1291
+--error 1292
 create procedure foo()
 foo: loop
   leave bar;
 end loop|
---error 1291
+--error 1292
 create procedure foo()
 foo: loop
   iterate bar;
 end loop|
---error 1291
+--error 1292
 create procedure foo()
 foo: begin
   iterate foo;
 end|
 
 # Redefining label
---error 1292 
+--error 1293 
 create procedure foo()
 foo: loop
   foo: loop
@@ -92,7 +92,7 @@ foo: loop
 end loop foo|
 
 # End label mismatch
---error 1293
+--error 1294
 create procedure foo()
 foo: loop
   set @x=2;
@@ -106,24 +106,13 @@ begin
 end|
 drop procedure foo|
 
-# We require INTO in SELECTs for some older clients (as mysql and mysqltest,
-# for now).
-create procedure foo()
-begin
-  select name from mysql.proc;
-  select type from mysql.proc;
-end|
---error 1295
-call foo()|
-drop procedure foo|
-
 # RETURN in FUNCTION only
---error 1296
+--error 1297
 create procedure foo()
   return 42|
 
 # Doesn't allow queries in FUNCTIONs (for now :-( )
---error 1297
+--error 1298
 create function foo() returns int
 begin
   declare x int;
@@ -137,19 +126,19 @@ create procedure p(x int)
 create function f(x int) returns int
   return x+42|
 
---error 1301
+--error 1302
 call p()|
---error 1301
+--error 1302
 call p(1, 2)|
---error 1301
+--error 1302
 select f()|
---error 1301
+--error 1302
 select f(1, 2)|
 
 drop procedure p|
 drop function f|
 
---error 1302
+--error 1303
 create procedure p(val int, out res int)
 begin
   declare x int default 0;
@@ -163,7 +152,7 @@ begin
   end if;
 end|
 
---error 1302
+--error 1303
 create procedure p(val int, out res int)
 begin
   declare x int default 0;
@@ -178,7 +167,7 @@ begin
   end if;
 end|
 
---error 1303
+--error 1304
 create function f(val int) returns int
 begin
   declare x int;
@@ -196,12 +185,12 @@ begin
   end if;
 end|
 
---error 1304
+--error 1305
 select f(10)|
 
 drop function f|
 
---error 1305
+--error 1306
 create procedure p()
 begin
   declare c cursor for insert into test.t1 values ("foo", 42);
@@ -210,7 +199,7 @@ begin
   close c;
 end|
 
---error 1306
+--error 1307
 create procedure p()
 begin
   declare x int;
@@ -220,7 +209,7 @@ begin
   close c;
 end|
 
---error 1307
+--error 1308
 create procedure p()
 begin
   declare c cursor for select * from test.t;
@@ -242,7 +231,7 @@ begin
   open c;
   close c;
 end|
---error 1308
+--error 1309
 call p()|
 drop procedure p|
 
@@ -254,11 +243,11 @@ begin
   close c;
   close c;
 end|
---error 1309
+--error 1310
 call p()|
 drop procedure p|
 
---error 1288
+--error 1289
 alter procedure bar3 sql security invoker|
 --error 1059
 alter procedure bar3 name
@@ -272,7 +261,7 @@ drop table if exists t1|
 create table t1 (val int, x float)|
 insert into t1 values (42, 3.1), (19, 1.2)|
 
---error 1310
+--error 1311
 create procedure p()
 begin
   declare c cursor for select * from t1;
@@ -292,7 +281,7 @@ begin
   fetch c into x;
   close c;
 end|
---error 1311
+--error 1312
 call p()|
 drop procedure p|
 
@@ -307,34 +296,34 @@ begin
   fetch c into x, y, z;
   close c;
 end|
---error 1311
+--error 1312
 call p()|
 drop procedure p|
 
---error 1313
+--error 1314
 create procedure p(in x int, x char(10))
 begin
 end|
---error 1313
+--error 1314
 create function p(x int, x char(10))
 begin
 end|
 
---error 1314
+--error 1315
 create procedure p()
 begin
   declare x float;
   declare x int;
 end|
 
---error 1315
+--error 1316
 create procedure p()
 begin
   declare c condition for 1064;
   declare c condition for 1065;
 end|
 
---error 1316
+--error 1317
 create procedure p()
 begin
   declare c cursor for select * from t1;
@@ -358,13 +347,13 @@ drop procedure bug1965|
 #
 # BUG#1966
 #
---error 1310
+--error 1311
 select 1 into a|
 
 #
 # BUG#336
 #
---error 1318
+--error 1319
 create procedure bug336(id char(16))
 begin
   declare x int;
@@ -374,7 +363,7 @@ end|
 #
 # BUG#1654
 #
---error 1297
+--error 1298
 create function bug1654()
   returns int
 return (select sum(t.data) from test.t2 t)|