Post-merge fixes, some quite complex. client/mysqlbinlog.cc and sql/log_event.cc

merged manually by guilhem.


client/mysqlbinlog.cc:
  Post-merge fixes; manually merged by guilhem.
include/mysqld_error.h:
  Post-merge fixes.
mysql-test/r/drop_temp_table.result:
  Post-merge fixes.
mysql-test/r/insert.result:
  Post-merge fixes.
mysql-test/r/mysqlbinlog.result:
  Post-merge fixes.
mysql-test/r/query_cache.result:
  Post-merge fixes.
mysql-test/r/rpl_error_ignored_table.result:
  Post-merge fixes.
mysql-test/r/rpl_relayrotate.result:
  Post-merge fixes.
mysql-test/r/rpl_trunc_binlog.result:
  Post-merge fixes.
mysql-test/r/sp-error.result:
  Post-merge fixes.
mysql-test/r/sp.result:
  Post-merge fixes.
mysql-test/r/system_mysql_db.result:
  Post-merge fixes.
mysql-test/r/variables.result:
  Post-merge fixes.
mysql-test/t/rpl_error_ignored_table.test:
  Post-merge fixes.
mysql-test/t/sp-error.test:
  Post-merge fixes.
sql/ha_innodb.cc:
  Post-merge fixes.
sql/log_event.cc:
  Post-merge fixes; manually merged by guilhem.
sql/set_var.cc:
  Post-merge fixes.
sql/share/danish/errmsg.txt:
  Post-merge fixes.
sql/share/dutch/errmsg.txt:
  Post-merge fixes.
sql/share/english/errmsg.txt:
  Post-merge fixes.
sql/share/estonian/errmsg.txt:
  Post-merge fixes.
sql/sp.cc:
  Post-merge fixes.
sql/sql_insert.cc:
  Post-merge fixes.
sql/sql_table.cc:
  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 1290
+--error 1295
 create procedure foo()
   create procedure bar() set @x=3|
---error 1290
+--error 1295
 create procedure foo()
   create function bar() returns double return 2.3|
 
 # Already exists
---error 1291
+--error 1296
 create procedure proc1()
   set @x = 42|
---error 1291
+--error 1296
 create function func1() returns int
   return 42|
 
@@ -51,39 +51,39 @@ drop procedure proc1|
 drop function func1|
 
 # Does not exist
---error 1292
+--error 1297
 alter procedure foo|
---error 1292
+--error 1297
 alter function foo|
---error 1292
+--error 1297
 drop procedure foo|
---error 1292
+--error 1297
 drop function foo|
---error 1292
+--error 1297
 call foo()|
 drop procedure if exists foo|
---error 1292
+--error 1297
 show create procedure foo|
 
 # LEAVE/ITERATE with no match
---error 1295
+--error 1300
 create procedure foo()
 foo: loop
   leave bar;
 end loop|
---error 1295
+--error 1300
 create procedure foo()
 foo: loop
   iterate bar;
 end loop|
---error 1295
+--error 1300
 create procedure foo()
 foo: begin
   iterate foo;
 end|
 
 # Redefining label
---error 1296 
+--error 1301
 create procedure foo()
 foo: loop
   foo: loop
@@ -92,7 +92,7 @@ foo: loop
 end loop foo|
 
 # End label mismatch
---error 1297
+--error 1302
 create procedure foo()
 foo: loop
   set @x=2;
@@ -107,12 +107,12 @@ end|
 drop procedure foo|
 
 # RETURN in FUNCTION only
---error 1300
+--error 1305
 create procedure foo()
   return 42|
 
 # Doesn't allow queries in FUNCTIONs (for now :-( )
---error 1301
+--error 1306
 create function foo() returns int
 begin
   declare x int;
@@ -126,19 +126,19 @@ create procedure p(x int)
 create function f(x int) returns int
   return x+42|
 
---error 1305
+--error 1310
 call p()|
---error 1305
+--error 1310
 call p(1, 2)|
---error 1305
+--error 1310
 select f()|
---error 1305
+--error 1310
 select f(1, 2)|
 
 drop procedure p|
 drop function f|
 
---error 1306
+--error 1311
 create procedure p(val int, out res int)
 begin
   declare x int default 0;
@@ -152,7 +152,7 @@ begin
   end if;
 end|
 
---error 1306
+--error 1311
 create procedure p(val int, out res int)
 begin
   declare x int default 0;
@@ -167,7 +167,7 @@ begin
   end if;
 end|
 
---error 1307
+--error 1312
 create function f(val int) returns int
 begin
   declare x int;
@@ -185,12 +185,12 @@ begin
   end if;
 end|
 
---error 1308
+--error 1313
 select f(10)|
 
 drop function f|
 
---error 1309
+--error 1314
 create procedure p()
 begin
   declare c cursor for insert into test.t1 values ("foo", 42);
@@ -199,7 +199,7 @@ begin
   close c;
 end|
 
---error 1310
+--error 1315
 create procedure p()
 begin
   declare x int;
@@ -209,7 +209,7 @@ begin
   close c;
 end|
 
---error 1311
+--error 1316
 create procedure p()
 begin
   declare c cursor for select * from test.t;
@@ -231,7 +231,7 @@ begin
   open c;
   close c;
 end|
---error 1312
+--error 1317
 call p()|
 drop procedure p|
 
@@ -243,11 +243,11 @@ begin
   close c;
   close c;
 end|
---error 1313
+--error 1318
 call p()|
 drop procedure p|
 
---error 1292
+--error 1297
 alter procedure bar3 sql security invoker|
 --error 1059
 alter procedure bar3 name
@@ -261,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 1314
+--error 1319
 create procedure p()
 begin
   declare x int;
@@ -281,7 +281,7 @@ begin
   fetch c into x;
   close c;
 end|
---error 1315
+--error 1320
 call p()|
 drop procedure p|
 
@@ -296,34 +296,34 @@ begin
   fetch c into x, y, z;
   close c;
 end|
---error 1315
+--error 1320
 call p()|
 drop procedure p|
 
---error 1317
+--error 1322
 create procedure p(in x int, x char(10))
 begin
 end|
---error 1317
+--error 1322
 create function p(x int, x char(10))
 begin
 end|
 
---error 1318
+--error 1323
 create procedure p()
 begin
   declare x float;
   declare x int;
 end|
 
---error 1319
+--error 1324	
 create procedure p()
 begin
   declare c condition for 1064;
   declare c condition for 1065;
 end|
 
---error 1320
+--error 1325
 create procedure p()
 begin
   declare c cursor for select * from t1;
@@ -331,18 +331,18 @@ begin
 end|
 
 # USE is not allowed
---error 1323
+--error 1328
 create procedure u()
   use sptmp|
 
 # Enforced standard order of declarations
---error 1324
+--error 1329
 create procedure p()
 begin
   declare c cursor for select * from t1;
   declare x int;
 end|
---error 1324
+--error 1329
 create procedure p()
 begin
   declare x int;
@@ -350,7 +350,7 @@ begin
   declare foo condition for sqlstate '42S99';
 end|
 
---error 1325
+--error 1330
 create procedure p()
 begin
   declare x int;
@@ -375,13 +375,13 @@ drop procedure bug1965|
 #
 # BUG#1966
 #
---error 1314
+--error 1319
 select 1 into a|
 
 #
 # BUG#336
 #
---error 1322
+--error 1327
 create procedure bug336(id char(16))
 begin
   declare x int;
@@ -391,7 +391,7 @@ end|
 #
 # BUG#1654
 #
---error 1301
+--error 1306
 create function bug1654()
   returns int
 return (select sum(t.data) from test.t2 t)|
@@ -429,7 +429,7 @@ begin
   fetch c1 into v1;
 end|
 
---error 1313
+--error 1318
 call bug2259()|
 drop procedure bug2259|
 
@@ -485,7 +485,7 @@ begin
   end case;
   return 2;
 end|
---error 1326
+--error 1331
 select bug3287()|
 drop function bug3287|
 
@@ -496,7 +496,7 @@ when 0 then
 when 1 then
   insert into test.t1 values (x, 1.1);
 end case|
---error 1326
+--error 1331
 call bug3287(2)|
 drop procedure bug3287|