Post-merge fixes.

mysql-test/r/sp-error.result

@@ -27,7 +27,7 @@ call foo();
 PROCEDURE foo does not exist
 drop procedure if exists foo;
 Warnings:
-Warning	1257	PROCEDURE foo does not exist
+Warning	1261	PROCEDURE foo does not exist
 create procedure foo()
 foo: loop
 leave bar;

mysql-test/r/variables.result

@@ -286,7 +286,7 @@ set sql_log_bin=1;
 set sql_log_off=1;
 set sql_log_update=1;
 Warnings:
-Note	1267	The update log is deprecated and replaced by the binary log. SET SQL_LOG_UPDATE has been ignored.
+Note	1271	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/sp-error.test

@@ -22,48 +22,48 @@ create function func1() returns int
   return 42|
 
 # Can't create recursively
---error 1255
+--error 1259
 create procedure foo()
   create procedure bar() set @x=3|
---error 1255
+--error 1259
 create procedure foo()
   create function bar() returns double return 2.3|
 
 # Already exists
---error 1256
+--error 1260
 create procedure proc1()
   set @x = 42|
---error 1256
+--error 1260
 create function func1() returns int
   return 42|
 
 # Does not exist
---error 1257
+--error 1261
 alter procedure foo|
---error 1257
+--error 1261
 alter function foo|
---error 1257
+--error 1261
 drop procedure foo|
---error 1257
+--error 1261
 drop function foo|
---error 1257
+--error 1261
 call foo()|
 drop procedure if exists foo|
 
 # LEAVE/ITERATE with no match
---error 1260
+--error 1264
 create procedure foo()
 foo: loop
   leave bar;
 end loop|
---error 1260
+--error 1264
 create procedure foo()
 foo: loop
   iterate bar;
 end loop|
 
 # Redefining label
---error 1261
+--error 1265
 create procedure foo()
 foo: loop
   foo: loop
@@ -72,14 +72,14 @@ foo: loop
 end loop foo|
 
 # End label mismatch
---error 1262
+--error 1266
 create procedure foo()
 foo: loop
   set @x=2;
 end loop bar|
 
 # Referring to undef variable
---error 1263
+--error 1267
 create procedure foo(out x int)
 begin
   declare y int;
@@ -87,17 +87,17 @@ begin
 end|
 
 # We require INTO in SELECTs (for now; this might change in the future)
---error 1264
+--error 1268
 create procedure foo(x int)
   select * from test.t1|
 
 # RETURN in FUNCTION only
---error 1265
+--error 1269
 create procedure foo()
   return 42|
 
 # Doesn't allow queries in FUNCTIONs (for now :-( )
---error 1266
+--error 1270
 create function foo() returns int
 begin
   declare x int;