Post-merge fixes.

6 files changed, 33 insertions, 33 deletions

diff --git a/mysql-test/r/distinct.result b/mysql-test/r/distinct.result
index 5e713f59100..38df7674ed8 100644
--- a/mysql-test/r/distinct.result
+++ b/mysql-test/r/distinct.result
@@ -457,10 +457,10 @@ drop table t1,t2;
 CREATE TABLE t1 (
 html varchar(5) default NULL,
 rin int(11) default '0',
-out int(11) default '0'
+rout int(11) default '0'
 ) TYPE=MyISAM;
 INSERT INTO t1 VALUES ('1',1,0);
-SELECT DISTINCT html,SUM(out)/(SUM(rin)+1) as 'prod' FROM t1 GROUP BY rin;
+SELECT DISTINCT html,SUM(rout)/(SUM(rin)+1) as 'prod' FROM t1 GROUP BY rin;
 html	prod
 1	0.00
 drop table t1;
diff --git a/mysql-test/r/query_cache.result b/mysql-test/r/query_cache.result
index 3207443369b..611c8464626 100644
--- a/mysql-test/r/query_cache.result
+++ b/mysql-test/r/query_cache.result
@@ -715,10 +715,10 @@ Variable_name	Value
 Qcache_queries_in_cache	0
 show status like "Qcache_inserts";
 Variable_name	Value
-Qcache_inserts	1
+Qcache_inserts	44
 show status like "Qcache_hits";
 Variable_name	Value
-Qcache_hits	1
+Qcache_hits	12
 /**/ select * from t1;
 a
 /**/ select * from t1;
@@ -728,8 +728,8 @@ Variable_name	Value
 Qcache_queries_in_cache	1
 show status like "Qcache_inserts";
 Variable_name	Value
-Qcache_inserts	2
+Qcache_inserts	45
 show status like "Qcache_hits";
 Variable_name	Value
-Qcache_hits	2
+Qcache_hits	13
 drop table t1;
diff --git a/mysql-test/r/sp-error.result b/mysql-test/r/sp-error.result
index d839b8a3af8..109d84b2b8a 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	1275	PROCEDURE foo does not exist
+Warning	1281	PROCEDURE foo does not exist
 create procedure foo()
 foo: loop
 leave bar;
diff --git a/mysql-test/r/variables.result b/mysql-test/r/variables.result
index 8bbe773ed01..55f49d49b87 100644
--- a/mysql-test/r/variables.result
+++ b/mysql-test/r/variables.result
@@ -311,7 +311,7 @@ set sql_log_bin=1;
 set sql_log_off=1;
 set sql_log_update=1;
 Warnings:
-Note	1285	The update log is deprecated and replaced by the binary log. SET SQL_LOG_UPDATE has been ignored.
+Note	1291	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;
diff --git a/mysql-test/t/distinct.test b/mysql-test/t/distinct.test
index 56c00e7501c..54e50fc7147 100644
--- a/mysql-test/t/distinct.test
+++ b/mysql-test/t/distinct.test
@@ -326,9 +326,9 @@ drop table t1,t2;
 CREATE TABLE t1 (
   html varchar(5) default NULL,
   rin int(11) default '0',
-  out int(11) default '0'
+  rout int(11) default '0'
 ) TYPE=MyISAM;
 
 INSERT INTO t1 VALUES ('1',1,0);
-SELECT DISTINCT html,SUM(out)/(SUM(rin)+1) as 'prod' FROM t1 GROUP BY rin;
+SELECT DISTINCT html,SUM(rout)/(SUM(rin)+1) as 'prod' FROM t1 GROUP BY rin;
 drop table t1;
diff --git a/mysql-test/t/sp-error.test b/mysql-test/t/sp-error.test
index 5d46c39b601..ab3ee6a9ac6 100644
--- a/mysql-test/t/sp-error.test
+++ b/mysql-test/t/sp-error.test
@@ -32,18 +32,18 @@ create function func1() returns int
   return 42|
 
 # Can't create recursively
---error 1273
+--error 1279
 create procedure foo()
   create procedure bar() set @x=3|
---error 1273
+--error 1279
 create procedure foo()
   create function bar() returns double return 2.3|
 
 # Already exists
---error 1274
+--error 1280
 create procedure proc1()
   set @x = 42|
---error 1274
+--error 1280
 create function func1() returns int
   return 42|
 
@@ -51,32 +51,32 @@ drop procedure proc1|
 drop function func1|
 
 # Does not exist
---error 1275
+--error 1281
 alter procedure foo|
---error 1275
+--error 1281
 alter function foo|
---error 1275
+--error 1281
 drop procedure foo|
---error 1275
+--error 1281
 drop function foo|
---error 1275
+--error 1281
 call foo()|
 drop procedure if exists foo|
 
 # LEAVE/ITERATE with no match
---error 1278
+--error 1284
 create procedure foo()
 foo: loop
   leave bar;
 end loop|
---error 1278
+--error 1284
 create procedure foo()
 foo: loop
   iterate bar;
 end loop|
 
 # Redefining label
---error 1279
+--error 1285
 create procedure foo()
 foo: loop
   foo: loop
@@ -85,14 +85,14 @@ foo: loop
 end loop foo|
 
 # End label mismatch
---error 1280
+--error 1286
 create procedure foo()
 foo: loop
   set @x=2;
 end loop bar|
 
 # Referring to undef variable
---error 1281
+--error 1287
 create procedure foo(out x int)
 begin
   declare y int;
@@ -106,17 +106,17 @@ begin
   select name from mysql.proc;
   select type from mysql.proc;
 end|
---error 1282
+--error 1288
 call foo()|
 drop procedure foo|
 
 # RETURN in FUNCTION only
---error 1283
+--error 1289
 create procedure foo()
   return 42|
 
 # Doesn't allow queries in FUNCTIONs (for now :-( )
---error 1284
+--error 1290
 create function foo() returns int
 begin
   declare x int;
@@ -130,19 +130,19 @@ create procedure p(x int)
 create function f(x int) returns int
   return x+42|
 
---error 1288
+--error 1294
 call p()|
---error 1288
+--error 1294
 call p(1, 2)|
---error 1288
+--error 1294
 select f()|
---error 1288
+--error 1294
 select f(1, 2)|
 
 drop procedure p|
 drop function f|
 
---error 1289
+--error 1295
 create procedure p(val int, out res int)
 begin
   declare x int default 0;
@@ -156,7 +156,7 @@ begin
   end if;
 end|
 
---error 1289
+--error 1295
 create procedure p(val int, out res int)
 begin
   declare x int default 0;