Post-merge fixes.

mysql-test/t/sp-error.test

@@ -32,18 +32,18 @@ create function func1() returns int
   return 42|
 
 # Can't create recursively
---error 1280
+--error 1284
 create procedure foo()
   create procedure bar() set @x=3|
---error 1280
+--error 1284
 create procedure foo()
   create function bar() returns double return 2.3|
 
 # Already exists
---error 1281
+--error 1285
 create procedure proc1()
   set @x = 42|
---error 1281
+--error 1285
 create function func1() returns int
   return 42|
 
@@ -51,37 +51,37 @@ drop procedure proc1|
 drop function func1|
 
 # Does not exist
---error 1282
+--error 1286
 alter procedure foo|
---error 1282
+--error 1286
 alter function foo|
---error 1282
+--error 1286
 drop procedure foo|
---error 1282
+--error 1286
 drop function foo|
---error 1282
+--error 1286
 call foo()|
 drop procedure if exists foo|
 
 # LEAVE/ITERATE with no match
---error 1285
+--error 1289
 create procedure foo()
 foo: loop
   leave bar;
 end loop|
---error 1285
+--error 1289
 create procedure foo()
 foo: loop
   iterate bar;
 end loop|
---error 1285
+--error 1289
 create procedure foo()
 foo: begin
   iterate foo;
 end|
 
 # Redefining label
---error 1286 
+--error 1290 
 create procedure foo()
 foo: loop
   foo: loop
@@ -90,14 +90,14 @@ foo: loop
 end loop foo|
 
 # End label mismatch
---error 1287
+--error 1291
 create procedure foo()
 foo: loop
   set @x=2;
 end loop bar|
 
 # Referring to undef variable
---error 1288
+--error 1292
 create procedure foo(out x int)
 begin
   declare y int;
@@ -111,17 +111,17 @@ begin
   select name from mysql.proc;
   select type from mysql.proc;
 end|
---error 1289
+--error 1293
 call foo()|
 drop procedure foo|
 
 # RETURN in FUNCTION only
---error 1290
+--error 1294
 create procedure foo()
   return 42|
 
 # Doesn't allow queries in FUNCTIONs (for now :-( )
---error 1291
+--error 1295
 create function foo() returns int
 begin
   declare x int;
@@ -135,19 +135,19 @@ create procedure p(x int)
 create function f(x int) returns int
   return x+42|
 
---error 1295
+--error 1299
 call p()|
---error 1295
+--error 1299
 call p(1, 2)|
---error 1295
+--error 1299
 select f()|
---error 1295
+--error 1299
 select f(1, 2)|
 
 drop procedure p|
 drop function f|
 
---error 1296
+--error 1300
 create procedure p(val int, out res int)
 begin
   declare x int default 0;
@@ -161,7 +161,7 @@ begin
   end if;
 end|
 
---error 1296
+--error 1300
 create procedure p(val int, out res int)
 begin
   declare x int default 0;
@@ -176,7 +176,7 @@ begin
   end if;
 end|
 
---error 1297
+--error 1301
 create function f(val int) returns int
 begin
   declare x int;
@@ -194,12 +194,12 @@ begin
   end if;
 end|
 
---error 1298
+--error 1302
 select f(10)|
 
 drop function f|
 
---error 1299
+--error 1303
 create procedure p()
 begin
   declare c cursor for insert into test.t1 values ("foo", 42);
@@ -208,7 +208,7 @@ begin
   close c;
 end|
 
---error 1300
+--error 1304
 create procedure p()
 begin
   declare x int;
@@ -218,7 +218,7 @@ begin
   close c;
 end|
 
---error 1301
+--error 1305
 create procedure p()
 begin
   declare c cursor for select * from test.t;
@@ -240,7 +240,7 @@ begin
   open c;
   close c;
 end|
---error 1302
+--error 1306
 call p()|
 drop procedure p|
 
@@ -252,11 +252,11 @@ begin
   close c;
   close c;
 end|
---error 1303
+--error 1307
 call p()|
 drop procedure p|
 
---error 1282
+--error 1286
 alter procedure bar3 sql security invoker|
 --error 1059
 alter procedure bar3 name
@@ -270,7 +270,7 @@ drop table if exists t1|
 create table t1 (val int, x float)|
 insert into t1 values (42, 3.1), (19, 1.2)|
 
---error 1304
+--error 1308
 create procedure p()
 begin
   declare c cursor for select * from t1;
@@ -290,7 +290,7 @@ begin
   fetch c into x;
   close c;
 end|
---error 1305
+--error 1309
 call p()|
 drop procedure p|
 
@@ -305,34 +305,34 @@ begin
   fetch c into x, y, z;
   close c;
 end|
---error 1305
+--error 1309
 call p()|
 drop procedure p|
 
---error 1307
+--error 1311
 create procedure p(in x int, x char(10))
 begin
 end|
---error 1307
+--error 1311
 create function p(x int, x char(10))
 begin
 end|
 
---error 1308
+--error 1312
 create procedure p()
 begin
   declare x float;
   declare x int;
 end|
 
---error 1309
+--error 1313
 create procedure p()
 begin
   declare c condition for 1064;
   declare c condition for 1065;
 end|
 
---error 1310
+--error 1314
 create procedure p()
 begin
   declare c cursor for select * from t1;