Merge 10.4 into 10.5

1 files changed, 9 insertions, 9 deletions

diff --git a/mysql-test/main/sp.result b/mysql-test/main/sp.result
index dd7e12949f4..ed20689ed11 100644
--- a/mysql-test/main/sp.result
+++ b/mysql-test/main/sp.result
@@ -4184,7 +4184,7 @@ select v, isnull(v);
 end if;
 end;
 end|
-ERROR 42S22: Unknown column 'undefined_var' in 'field list'
+ERROR 42000: Undeclared variable: undefined_var
 create procedure bug14643_2()
 begin
 declare continue handler for sqlexception select 'boo' as 'Handler';
@@ -4196,7 +4196,7 @@ select 2;
 end case;
 select undefined_var;
 end|
-ERROR 42S22: Unknown column 'undefined_var' in 'field list'
+ERROR 42000: Undeclared variable: undefined_var
 drop procedure if exists bug14304|
 drop table if exists t3, t4|
 create table t3(a int primary key auto_increment)|
@@ -4226,7 +4226,7 @@ create procedure bug14376()
 begin
 declare x int default x;
 end|
-ERROR 42S22: Unknown column 'x' in 'field list'
+ERROR 42000: Undeclared variable: x
 create procedure bug14376()
 begin
 declare x int default 42;
@@ -4481,7 +4481,7 @@ select 'no' as 'v';
 end if;
 select 'done' as 'End';
 end|
-ERROR 42S22: Unknown column 'v' in 'field list'
+ERROR 42000: Undeclared variable: v
 create procedure bug14498_2()
 begin
 declare continue handler for sqlexception select 'error' as 'Handler';
@@ -4490,7 +4490,7 @@ select 'yes' as 'v';
 end while;
 select 'done' as 'End';
 end|
-ERROR 42S22: Unknown column 'v' in 'field list'
+ERROR 42000: Undeclared variable: v
 create procedure bug14498_3()
 begin
 declare continue handler for sqlexception select 'error' as 'Handler';
@@ -4499,7 +4499,7 @@ select 'maybe' as 'v';
 until v end repeat;
 select 'done' as 'End';
 end|
-ERROR 42S22: Unknown column 'v' in 'field list'
+ERROR 42000: Undeclared variable: v
 create procedure bug14498_4()
 begin
 declare continue handler for sqlexception select 'error' as 'Handler';
@@ -4513,7 +4513,7 @@ select '?' as 'v';
 end case;
 select 'done' as 'End';
 end|
-ERROR 42S22: Unknown column 'v' in 'field list'
+ERROR 42000: Undeclared variable: v
 create procedure bug14498_5()
 begin
 declare continue handler for sqlexception select 'error' as 'Handler';
@@ -4527,7 +4527,7 @@ select '?' as 'v';
 end case;
 select 'done' as 'End';
 end|
-ERROR 42S22: Unknown column 'v' in 'field list'
+ERROR 42000: Undeclared variable: v
 drop table if exists t3|
 drop procedure if exists bug15231_1|
 drop procedure if exists bug15231_2|
@@ -8401,7 +8401,7 @@ DECLARE name VARCHAR(10);
 SET name="hello";
 call p1(name2);
 END|
-ERROR 42S22: Unknown column 'name2' in 'field list'
+ERROR 42000: Undeclared variable: name2
 call p2();
 a
 hello