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.

client/mysqltest.c

@@ -135,8 +135,6 @@ static const char *embedded_server_groups[] = {
   NullS
 };
 
-static char delimiter= DEFAULT_DELIMITER;
-
 DYNAMIC_ARRAY q_lines;
 
 #include "sslopt-vars.h"
@@ -1629,17 +1627,6 @@ int do_while(struct st_query* q)
   return 0;
 }
 
-int do_delimiter(char *p)
-{
-  while (*p && my_isspace(charset_info,*p))
-    p++;
-  if (!*p)
-    die("Missing delimiter character\n");
-  delimiter=*p;
-
-  return 0;
-}
-
 
 my_bool end_of_query(int c, char* p)
 {
@@ -2645,9 +2632,6 @@ int main(int argc, char **argv)
 	do_sync_with_master2("");
 	break;
       }
-      case Q_DELIMITER: 
-	do_delimiter(q->first_argument);
-	break;
       case Q_COMMENT:				/* Ignore row */
       case Q_COMMENT_WITH_COMMAND:
 	break;

mysql-test/r/index_merge_innodb.result

@@ -5,7 +5,7 @@ key1 int not null,
 key2 int not null, 
 INDEX i1(key1),
 INDEX i2(key2),
-) type=innodb;
+) engine=innodb;
 explain select * from t1 where key1 < 5 or key2 > 197;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t1	index_merge	i1,i2	i1,i2	4,4	NULL	8	Using where

mysql-test/r/sp-error.result

 delete from mysql.proc;
-create procedure syntaxerror(t int);
+create procedure syntaxerror(t int)|
 ERROR 42000: You have an error in your SQL syntax.  Check the manual that corresponds to your MySQL server version for the right syntax to use near '' at line 1
-create procedure syntaxerror(t int);
+create procedure syntaxerror(t int)|
 ERROR 42000: You have an error in your SQL syntax.  Check the manual that corresponds to your MySQL server version for the right syntax to use near '' at line 1
-create procedure syntaxerror(t int);
+create procedure syntaxerror(t int)|
 ERROR 42000: You have an error in your SQL syntax.  Check the manual that corresponds to your MySQL server version for the right syntax to use near '' at line 1
 create procedure proc1()
-set @x = 42;
+set @x = 42|
 create function func1() returns int
-return 42;
+return 42|
 create procedure foo()
-create procedure bar() set @x=3;
+create procedure bar() set @x=3|
 ERROR 2F003: Can't create a PROCEDURE from within another stored routine
 create procedure foo()
-create function bar() returns double return 2.3;
+create function bar() returns double return 2.3|
 ERROR 2F003: Can't create a FUNCTION from within another stored routine
 create procedure proc1()
-set @x = 42;
+set @x = 42|
 ERROR 42000: PROCEDURE proc1 already exists
 create function func1() returns int
-return 42;
+return 42|
 ERROR 42000: FUNCTION func1 already exists
-drop procedure proc1;
-drop function func1;
-alter procedure foo;
+drop procedure proc1|
+drop function func1|
+alter procedure foo|
 ERROR 42000: PROCEDURE foo does not exist
-alter function foo;
+alter function foo|
 ERROR 42000: FUNCTION foo does not exist
-drop procedure foo;
+drop procedure foo|
 ERROR 42000: PROCEDURE foo does not exist
-drop function foo;
+drop function foo|
 ERROR 42000: FUNCTION foo does not exist
-call foo();
+call foo()|
 ERROR 42000: PROCEDURE foo does not exist
-drop procedure if exists foo;
+drop procedure if exists foo|
 Warnings:
-Warning	1288	PROCEDURE foo does not exist
-show create procedure foo;
+Warning	1289	PROCEDURE foo does not exist
+show create procedure foo|
 ERROR 42000: PROCEDURE foo does not exist
 create procedure foo()
 foo: loop
 leave bar;
-end loop;
+end loop|
 ERROR 42000: LEAVE with no matching label: bar
 create procedure foo()
 foo: loop
 iterate bar;
-end loop;
+end loop|
 ERROR 42000: ITERATE with no matching label: bar
 create procedure foo()
 foo: begin
 iterate foo;
-end;
+end|
 ERROR 42000: ITERATE with no matching label: foo
 create procedure foo()
 foo: loop
 foo: loop
 set @x=2;
 end loop foo;
-end loop foo;
+end loop foo|
 ERROR 42000: Redefining label foo
 create procedure foo()
 foo: loop
 set @x=2;
-end loop bar;
+end loop bar|
 ERROR 42000: End-label bar without match
 create procedure foo(out x int)
 begin
 declare y int;
 set x = y;
-end;
+end|
 Warnings:
-Warning	1294	Referring to uninitialized variable y
-drop procedure foo;
-create procedure foo()
-begin
-select name from mysql.proc;
-select type from mysql.proc;
-end;
-call foo();
-ERROR 0A000: SELECT in a stored procedure must have INTO
-drop procedure foo;
+Warning	1295	Referring to uninitialized variable y
+drop procedure foo|
 create procedure foo()
-return 42;
+return 42|
 ERROR 42000: RETURN is only allowed in a FUNCTION
 create function foo() returns int
 begin
 declare x int;
 select max(c) into x from test.t;
 return x;
-end;
+end|
 ERROR 0A000: Statements like SELECT, INSERT, UPDATE (and others) are not allowed in a FUNCTION
 create procedure p(x int)
-insert into test.t1 values (x);
+insert into test.t1 values (x)|
 create function f(x int) returns int
-return x+42;
-call p();
+return x+42|
+call p()|
 ERROR 42000: Wrong number of arguments for PROCEDURE p, expected 1, got 0
-call p(1, 2);
+call p(1, 2)|
 ERROR 42000: Wrong number of arguments for PROCEDURE p, expected 1, got 2
-select f();
+select f()|
 ERROR 42000: Wrong number of arguments for FUNCTION f, expected 1, got 0
-select f(1, 2);
+select f(1, 2)|
 ERROR 42000: Wrong number of arguments for FUNCTION f, expected 1, got 2
-drop procedure p;
-drop function f;
+drop procedure p|
+drop function f|
 create procedure p(val int, out res int)
 begin
 declare x int default 0;
@@ -115,7 +107,7 @@ set res = 0;
 else
 set res = 1;
 end if;
-end;
+end|
 ERROR 42000: Undefined CONDITION: foo
 create procedure p(val int, out res int)
 begin
@@ -128,13 +120,13 @@ set res = 0;
 else
 set res = 1;
 end if;
-end;
+end|
 ERROR 42000: Undefined CONDITION: bar
 create function f(val int) returns int
 begin
 declare x int;
 set x = val+3;
-end;
+end|
 ERROR 42000: No RETURN found in FUNCTION f
 create function f(val int) returns int
 begin
@@ -143,16 +135,16 @@ set x = val+3;
 if x < 4 then
 return x;
 end if;
-end;
-select f(10);
+end|
+select f(10)|
 ERROR 2F005: FUNCTION f ended without RETURN
-drop function f;
+drop function f|
 create procedure p()
 begin
 declare c cursor for insert into test.t1 values ("foo", 42);
 open c;
 close c;
-end;
+end|
 ERROR 42000: Cursor statement must be a SELECT
 create procedure p()
 begin
@@ -160,46 +152,46 @@ declare x int;
 declare c cursor for select * into x from test.t limit 1;
 open c;
 close c;
-end;
+end|
 ERROR 42000: Cursor SELECT must not have INTO
 create procedure p()
 begin
 declare c cursor for select * from test.t;
 open cc;
 close c;
-end;
+end|
 ERROR 42000: Undefined CURSOR: cc
-drop table if exists t1;
-create table t1 (val int);
+drop table if exists t1|
+create table t1 (val int)|
 create procedure p()
 begin
 declare c cursor for select * from test.t1;
 open c;
 open c;
 close c;
-end;
-call p();
+end|
+call p()|
 ERROR 24000: Cursor is already open
-drop procedure p;
+drop procedure p|
 create procedure p()
 begin
 declare c cursor for select * from test.t1;
 open c;
 close c;
 close c;
-end;
-call p();
+end|
+call p()|
 ERROR 24000: Cursor is not open
-drop procedure p;
-alter procedure bar3 sql security invoker;
+drop procedure p|
+alter procedure bar3 sql security invoker|
 ERROR 42000: PROCEDURE bar3 does not exist
 alter procedure bar3 name
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA;
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA|
 ERROR 42000: Identifier name 'AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' is too long
-drop table t1;
-drop table if exists t1;
-create table t1 (val int, x float);
-insert into t1 values (42, 3.1), (19, 1.2);
+drop table t1|
+drop table if exists t1|
+create table t1 (val int, x float)|
+insert into t1 values (42, 3.1), (19, 1.2)|
 create procedure p()
 begin
 declare c cursor for select * from t1;
@@ -207,7 +199,7 @@ declare x int;
 open c;
 fetch c into x, y;
 close c;
-end;
+end|
 ERROR 42000: Undeclared variable: y
 create procedure p()
 begin
@@ -216,10 +208,10 @@ declare x int;
 open c;
 fetch c into x;
 close c;
-end;
-call p();
+end|
+call p()|
 ERROR HY000: Wrong number of FETCH variables
-drop procedure p;
+drop procedure p|
 create procedure p()
 begin
 declare c cursor for select * from t1;
@@ -229,66 +221,66 @@ declare z int;
 open c;
 fetch c into x, y, z;
 close c;
-end;
-call p();
+end|
+call p()|
 ERROR HY000: Wrong number of FETCH variables
-drop procedure p;
+drop procedure p|
 create procedure p(in x int, x char(10))
 begin
-end;
+end|
 ERROR 42000: Duplicate parameter: x
 create function p(x int, x char(10))
 begin
-end;
+end|
 ERROR 42000: Duplicate parameter: x
 create procedure p()
 begin
 declare x float;
 declare x int;
-end;
+end|
 ERROR 42000: Duplicate variable: x
 create procedure p()
 begin
 declare c condition for 1064;
 declare c condition for 1065;
-end;
+end|
 ERROR 42000: Duplicate condition: c
 create procedure p()
 begin
 declare c cursor for select * from t1;
 declare c cursor for select field from t1;
-end;
+end|
 ERROR 42000: Duplicate cursor: c
 create procedure bug1965()
 begin
 declare c cursor for select val from t1 order by valname;
 open c;
 close c;
-end;
-call bug1965();
+end|
+call bug1965()|
 ERROR 42S22: Unknown column 'valname' in 'order clause'
-drop procedure bug1965;
-select 1 into a;
+drop procedure bug1965|
+select 1 into a|
 ERROR 42000: Undeclared variable: a
 create procedure bug336(id char(16))
 begin
 declare x int;
 set x = (select sum(t.data) from test.t2 t);
-end;
+end|
 ERROR 0A000: Subselect value not supported
 create function bug1654()
 returns int
-return (select sum(t.data) from test.t2 t);
+return (select sum(t.data) from test.t2 t)|
 ERROR 0A000: Statements like SELECT, INSERT, UPDATE (and others) are not allowed in a FUNCTION
-drop table if exists table_1;
-create table t3 (column_1_0 int);
+drop table if exists table_1|
+create table t3 (column_1_0 int)|
 create procedure bug1653()
-update t3 set column_1 = 0;
-call bug1653();
+update t3 set column_1 = 0|
+call bug1653()|
 ERROR 42S22: Unknown column 'column_1' in 'field list'
-drop table t3;
-create table t3 (column_1 int);
-call bug1653();
-drop procedure bug1653;
-drop table t3;
-drop table t1;
+drop table t3|
+create table t3 (column_1 int)|
+call bug1653()|
+drop procedure bug1653|
+drop table t3|
+drop table t1|

mysql-test/r/variables.result

@@ -360,7 +360,7 @@ set sql_log_bin=1;
 set sql_log_off=1;
 set sql_log_update=1;
 Warnings:
-Note	1298	The update log is deprecated and replaced by the binary log. SET SQL_LOG_UPDATE has been ignored.
+Note	1299	The update log is deprecated and replaced by the binary log. SET SQL_LOG_UPDATE has been ignored.
 set sql_low_priority_updates=1;
 set sql_max_join_size=200;
 select @@sql_max_join_size,@@max_join_size;

mysql-test/t/index_merge_innodb.test

@@ -14,7 +14,7 @@ create table t1
   
   INDEX i1(key1),
   INDEX i2(key2),
-) type=innodb;
+) engine=innodb;
 
 --disable_query_log
 let $1=200;

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)|

mysql-test/t/sp.test

@@ -289,7 +289,7 @@ select sub3((select max(i) from t2))|
 drop procedure sub1|
 #drop procedure sub2|
 drop function sub3|
-
+delete from t2|
 
 # Basic tests of the flow control constructs
 
@@ -462,6 +462,30 @@ delete from t1|
 drop procedure i|
 
 
+# SELECT with one of more result set sent back to the clinet
+insert into t1 values ("foo", 3), ("bar", 19)|
+insert into t2 values ("x", 9, 4.1), ("y", -1, 19.2), ("z", 3, 2.2)|
+
+create procedure sel1()
+begin
+  select * from t1;
+end|
+
+call sel1()|
+drop procedure sel1|
+
+create procedure sel2()
+begin
+  select * from t1;
+  select * from t2;
+end|
+
+call sel2()|
+drop procedure sel2|
+delete from t1|
+delete from t2|
+
+
 # SELECT INTO local variables
 create procedure into_test(x char(16), y int)
 begin
@@ -501,7 +525,6 @@ begin
 end|
 
 insert into t1 values ("into3", 19)|
-delete from t2|
 # Two call needed for bug test
 call into_test3()|
 call into_test3()|

sql/lex.h

@@ -258,8 +258,8 @@ static SYMBOL symbols[] = {
   { "LOGS",		SYM(LOGS_SYM),0,0},
   { "LONG",		SYM(LONG_SYM),0,0},
   { "LONGBLOB",		SYM(LONGBLOB),0,0},
-  { "LOOP",             SYM(LOOP_SYM),0,0},
   { "LONGTEXT",		SYM(LONGTEXT),0,0},
+  { "LOOP",             SYM(LOOP_SYM),0,0},
   { "LOW_PRIORITY",	SYM(LOW_PRIORITY),0,0},
   { "MASTER",           SYM(MASTER_SYM),0,0},
   { "MASTER_CONNECT_RETRY",           SYM(MASTER_CONNECT_RETRY_SYM),0,0},
@@ -480,7 +480,6 @@ static SYMBOL symbols[] = {
   { "WORK",		SYM(WORK_SYM),0,0},
   { "WRITE",		SYM(WRITE_SYM),0,0},
   { "WHILE",		SYM(WHILE_SYM),0,0},
-  { "NO_WRITE_TO_BINLOG",  SYM(NO_WRITE_TO_BINLOG),0,0},
   { "X509",		SYM(X509_SYM),0,0},
   { "XOR",		SYM(XOR),0,0},
   { "YEAR",		SYM(YEAR_SYM),0,0},