Post-merge fixes.

3 files changed, 10 insertions, 11 deletions

diff --git a/mysql-test/r/query_cache.result b/mysql-test/r/query_cache.result
index b04a41235e9..575f0ff97b6 100644
--- a/mysql-test/r/query_cache.result
+++ b/mysql-test/r/query_cache.result
@@ -808,17 +808,17 @@ Qcache_hits	6
 show status like "Qcache_queries_in_cache";
 Variable_name	Value
 Qcache_queries_in_cache	4
-DROP TABLE t1;
+drop table t1;
 create table t1 (a int);
 show status like "Qcache_queries_in_cache";
 Variable_name	Value
 Qcache_queries_in_cache	0
 show status like "Qcache_inserts";
 Variable_name	Value
-Qcache_inserts	48
+Qcache_inserts	8
 show status like "Qcache_hits";
 Variable_name	Value
-Qcache_hits	12
+Qcache_hits	6
 /**/ select * from t1;
 a
 /**/ select * from t1;
@@ -828,10 +828,9 @@ Variable_name	Value
 Qcache_queries_in_cache	1
 show status like "Qcache_inserts";
 Variable_name	Value
-Qcache_inserts	49
+Qcache_inserts	9
 show status like "Qcache_hits";
 Variable_name	Value
-Qcache_hits	13
-drop table t1;
-
+Qcache_hits	7
+DROP TABLE t1;
 SET GLOBAL query_cache_size=0;
diff --git a/mysql-test/r/sp-error.result b/mysql-test/r/sp-error.result
index adfecc151b7..1a04efad6bc 100644
--- a/mysql-test/r/sp-error.result
+++ b/mysql-test/r/sp-error.result
@@ -35,7 +35,7 @@ call foo();
 ERROR HY000: PROCEDURE foo does not exist
 drop procedure if exists foo;
 Warnings:
-Warning	1282	PROCEDURE foo does not exist
+Warning	1286	PROCEDURE foo does not exist
 create procedure foo()
 foo: loop
 leave bar;
diff --git a/mysql-test/r/sp.result b/mysql-test/r/sp.result
index 56f6bc59087..abc24acc290 100644
--- a/mysql-test/r/sp.result
+++ b/mysql-test/r/sp.result
@@ -606,7 +606,7 @@ create procedure hndlr4()
 begin
 declare x int default 0;
 declare val int;	                           # No default
-declare continue handler for 1306 set x=1;
+declare continue handler for 1310 set x=1;
 select data into val from test.t3 where id='z' limit 1;  # No hits
 insert into test.t3 values ('z', val);
 end;
@@ -619,7 +619,7 @@ drop procedure hndlr4;
 create procedure cur1()
 begin
 declare done int default 0;
-declare continue handler for 1306 set done = 1;
+declare continue handler for 1310 set done = 1;
 declare c cursor for select * from test.t2;
 declare a char(16);
 declare b int;
@@ -646,7 +646,7 @@ create table t3 ( s char(16), i int );
 create procedure cur2()
 begin
 declare done int default 0;
-declare continue handler for 1306 set done = 1;
+declare continue handler for 1310 set done = 1;
 declare c1 cursor for select id,data from test.t1;
 declare c2 cursor for select i from test.t2;
 open c1;