diff --git a/mysql-test/main/alias.result b/mysql-test/main/alias.result
index e6387de50a7..17150913761 100644
--- a/mysql-test/main/alias.result
+++ b/mysql-test/main/alias.result
@@ -59,7 +59,7 @@ SELECT ELT(FIELD(kundentyp,'PP','PPA','PG','PGA','FK','FKA','FP','FPA','K','KA',
 Kundentyp	kategorie
 Privat (Private Nutzung)	Mobilfunk
 Warnings:
-Warning	1052	Column 'kundentyp' in group statement is ambiguous
+Warning	1052	Column 'kundentyp' in GROUP BY is ambiguous
 drop table t1;
 CREATE TABLE t1 (
 AUFNR varchar(12) NOT NULL default '',
diff --git a/mysql-test/main/alter_table.result b/mysql-test/main/alter_table.result
index c3d364b8edb..f23166ca82b 100644
--- a/mysql-test/main/alter_table.result
+++ b/mysql-test/main/alter_table.result
@@ -712,7 +712,7 @@ ERROR 42000: You have an error in your SQL syntax; check the manual that corresp
 alter table table_24562 order by (select 12 from dual);
 ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '(select 12 from dual)' at line 1
 alter table table_24562 order by no_such_col;
-ERROR 42S22: Unknown column 'no_such_col' in 'order clause'
+ERROR 42S22: Unknown column 'no_such_col' in 'ORDER BY'
 drop table table_24562;
 create table t1 (mycol int(10) not null);
 alter table t1 alter column mycol set default 0;
diff --git a/mysql-test/main/alter_table_combinations.result b/mysql-test/main/alter_table_combinations.result
index e050fe6655d..08cf6c4707c 100644
--- a/mysql-test/main/alter_table_combinations.result
+++ b/mysql-test/main/alter_table_combinations.result
@@ -228,7 +228,7 @@ ERROR HY000: View 'test.v1' references invalid table(s) or column(s) or function
 UPDATE t2 SET f = f + 10;
 ERROR 42S22: Unknown column 'd' in 'OLD'
 CALL sp1();
-ERROR 42S22: Unknown column 'd' in 'field list'
+ERROR 42S22: Unknown column 'd' in 'INSERT INTO'
 DROP TRIGGER trg1;
 DROP PROCEDURE sp1;
 CREATE TABLE t_gen(a INT, b DOUBLE GENERATED ALWAYS AS (SQRT(a)));
diff --git a/mysql-test/main/analyze_stmt.result b/mysql-test/main/analyze_stmt.result
index c5d35759c9c..2db78ec75d0 100644
--- a/mysql-test/main/analyze_stmt.result
+++ b/mysql-test/main/analyze_stmt.result
@@ -204,17 +204,17 @@ drop table t0, t1;
 create table t1 (i int);
 insert into t1 values (1),(2);
 analyze select a from t1;
-ERROR 42S22: Unknown column 'a' in 'field list'
+ERROR 42S22: Unknown column 'a' in 'SELECT'
 analyze delete from t1 where a=2;
-ERROR 42S22: Unknown column 'a' in 'where clause'
+ERROR 42S22: Unknown column 'a' in 'WHERE'
 analyze update t1 set a=2;
-ERROR 42S22: Unknown column 'a' in 'field list'
+ERROR 42S22: Unknown column 'a' in 'SET'
 create table t2 like t1;
 insert into t2 select * from t1;
 analyze update t2,t1 set t2.i=5 where t2.a=t1.a;
-ERROR 42S22: Unknown column 't2.a' in 'where clause'
+ERROR 42S22: Unknown column 't2.a' in 'WHERE'
 analyze delete t1 from t2,t1 where t2.a=t1.a;
-ERROR 42S22: Unknown column 't2.a' in 'where clause'
+ERROR 42S22: Unknown column 't2.a' in 'WHERE'
 drop table t1, t2;
 #
 # MDEV-6395: ANALYZE UPDATE/DELETE with impossible where does not produce any output
diff --git a/mysql-test/main/compress.result b/mysql-test/main/compress.result
index 24979346149..0e555b9fa70 100644
--- a/mysql-test/main/compress.result
+++ b/mysql-test/main/compress.result
@@ -2162,7 +2162,7 @@ SELECT ELT(FIELD(kundentyp,'PP','PPA','PG','PGA','FK','FKA','FP','FPA','K','KA',
 Kundentyp	kategorie
 Privat (Private Nutzung)	Mobilfunk
 Warnings:
-Warning	1052	Column 'kundentyp' in group statement is ambiguous
+Warning	1052	Column 'kundentyp' in GROUP BY is ambiguous
 drop table t1;
 SHOW STATUS LIKE 'Compression';
 Variable_name	Value
diff --git a/mysql-test/main/cte_nonrecursive.result b/mysql-test/main/cte_nonrecursive.result
index 552be4ad03c..01b984ceb70 100644
--- a/mysql-test/main/cte_nonrecursive.result
+++ b/mysql-test/main/cte_nonrecursive.result
@@ -750,7 +750,7 @@ ERROR HY000: No anchors for recursive WITH element 's'
 #erroneous definition of unreferenced with table t
 with t as (select count(*) from t1 where d>='f' group by a)
 select t1.b from t2,t1 where t1.a = t2.c;
-ERROR 42S22: Unknown column 'd' in 'where clause'
+ERROR 42S22: Unknown column 'd' in 'WHERE'
 with t as (select count(*) from t1 where b>='f' group by a)
 select t1.b from t2,t1 where t1.a = t2.c;
 b
@@ -762,11 +762,11 @@ ggg
 with t(d) as (select count(*) from t1 where b<='ccc' group by b),
 s as (select * from t1 where a in (select t2.d from t2,t where t2.c=t.d))
 select t1.b from t1,t2 where t1.a=t2.c;
-ERROR 42S22: Unknown column 't2.d' in 'field list'
+ERROR 42S22: Unknown column 't2.d' in 'SELECT'
 with t(d) as (select count(*) from t1 where b<='ccc' group by b),
 s as (select * from t1 where a in (select t2.c from t2,t where t2.c=t.c))
 select t1.b from t1,t2 where t1.a=t2.c;
-ERROR 42S22: Unknown column 't.c' in 'where clause'
+ERROR 42S22: Unknown column 't.c' in 'WHERE'
 with t(d) as (select count(*) from t1 where b<='ccc' group by b),
 s as (select * from t1 where a in (select t2.c from t2,t where t2.c=t.d))
 select t1.b from t1,t2 where t1.a=t2.c;
@@ -1889,13 +1889,13 @@ cte1(a) as (select * from t1 where c1 <= 2),
 cte2(b) as (select * from cte1 where c1 >= 2),
 cte3 as (select * from cte1,cte2 where cte1.a < cte2.b)
 select * from t2;
-ERROR 42S22: Unknown column 'c1' in 'where clause'
+ERROR 42S22: Unknown column 'c1' in 'WHERE'
 with
 cte1(a) as (select * from t1 where c1 <= 2),
 cte2(b) as (select * from cte1 where a >= 2),
 cte3 as (select * from cte1,cte2 where cte1.a < cte2.c1)
 select * from t2;
-ERROR 42S22: Unknown column 'cte2.c1' in 'where clause'
+ERROR 42S22: Unknown column 'cte2.c1' in 'WHERE'
 with
 cte1 as (select * from t1 where c1 <= 2),
 cte2(a,b) as (select * from cte1 as s1, cte1 as s2 where s1.c1=s2.c1)
@@ -1914,7 +1914,7 @@ with
 cte1 as (select * from t1 where c1 <= 2),
 cte2(a,b) as (select * from cte1 as s1, cte1 as s2 where s1.c1=c1)
 select * from t2;
-ERROR 23000: Column 'c1' in where clause is ambiguous
+ERROR 23000: Column 'c1' in WHERE is ambiguous
 with cte3 as
 ( with cte2(a,b) as
 ( with cte1 as (select * from t1 where c1 <= 2)
@@ -1941,7 +1941,7 @@ with cte3 as
 select * from cte1 as s1, cte1 as s2 where s1.c1=s2.c1)
 select r1.c1,r2.c1 from cte2 as r1, cte2 as r2)
 select * from t2;
-ERROR 42S22: Unknown column 'r1.c1' in 'field list'
+ERROR 42S22: Unknown column 'r1.c1' in 'SELECT'
 create procedure p1()
 begin
 insert into t2
@@ -1962,7 +1962,7 @@ with cte1 as (select a from t1)
 select * from t1 as s, t1 as t where s.c1=t.c1 and s.c1 <= 2 and t.c1 >= 2;
 end |
 call p1();
-ERROR 42S22: Unknown column 'a' in 'field list'
+ERROR 42S22: Unknown column 'a' in 'SELECT'
 drop procedure p1;
 drop table t1,t2;
 #
diff --git a/mysql-test/main/cte_recursive.result b/mysql-test/main/cte_recursive.result
index 9a28e5c222f..415ab7129c8 100644
--- a/mysql-test/main/cte_recursive.result
+++ b/mysql-test/main/cte_recursive.result
@@ -4543,33 +4543,33 @@ insert into t1 values (3), (7), (1);
 with recursive
 r as (select * from t1 union select s1.* from t1 as s1, r where s1.a = r.b)
 select * from t1 as t;
-ERROR 42S22: Unknown column 'r.b' in 'where clause'
+ERROR 42S22: Unknown column 'r.b' in 'WHERE'
 explain with recursive
 r as (select * from t1 union select s1.* from t1 as s1, r where s1.a = r.b)
 select * from t1 as t;
-ERROR 42S22: Unknown column 'r.b' in 'where clause'
+ERROR 42S22: Unknown column 'r.b' in 'WHERE'
 create procedure sp1() with recursive
 r as (select * from t1 union select s1.* from t1 as s1, r where s1.a = r.b)
 select * from t1 as t;
 call sp1();
-ERROR 42S22: Unknown column 'r.b' in 'where clause'
+ERROR 42S22: Unknown column 'r.b' in 'WHERE'
 call sp1();
-ERROR 42S22: Unknown column 'r.b' in 'where clause'
+ERROR 42S22: Unknown column 'r.b' in 'WHERE'
 with recursive
 r as (select * from t1 union select s1.* from t1 as s1, r where s1.b = r.a)
 select * from t1 as t;
-ERROR 42S22: Unknown column 's1.b' in 'where clause'
+ERROR 42S22: Unknown column 's1.b' in 'WHERE'
 explain with recursive
 r as (select * from t1 union select s1.* from t1 as s1, r where s1.b = r.a)
 select * from t1 as t;
-ERROR 42S22: Unknown column 's1.b' in 'where clause'
+ERROR 42S22: Unknown column 's1.b' in 'WHERE'
 create procedure sp2() with recursive
 r as (select * from t1 union select s1.* from t1 as s1, r where s1.b = r.a)
 select * from t1 as t;
 call sp2();
-ERROR 42S22: Unknown column 's1.b' in 'where clause'
+ERROR 42S22: Unknown column 's1.b' in 'WHERE'
 call sp2();
-ERROR 42S22: Unknown column 's1.b' in 'where clause'
+ERROR 42S22: Unknown column 's1.b' in 'WHERE'
 drop procedure sp1;
 drop procedure sp2;
 drop table t1;
diff --git a/mysql-test/main/delayed.result b/mysql-test/main/delayed.result
index 6113e2deb53..613ffa93424 100644
--- a/mysql-test/main/delayed.result
+++ b/mysql-test/main/delayed.result
@@ -253,7 +253,7 @@ CREATE TABLE t1 (a INT);
 INSERT DELAYED INTO t1 SET a= b();
 ERROR 42000: FUNCTION test.b does not exist
 INSERT DELAYED INTO t1 SET b= 1;
-ERROR 42S22: Unknown column 'b' in 'field list'
+ERROR 42S22: Unknown column 'b' in 'INSERT INTO'
 INSERT DELAYED INTO t1 SET b= b();
 ERROR 42000: FUNCTION test.b does not exist
 DROP TABLE t1;
diff --git a/mysql-test/main/delete.result b/mysql-test/main/delete.result
index 7a9963abc71..a36bc7ae50f 100644
--- a/mysql-test/main/delete.result
+++ b/mysql-test/main/delete.result
@@ -53,7 +53,7 @@ CREATE TABLE `t1` (
 PRIMARY KEY  (`i`)
 );
 DELETE FROM t1 USING t1 WHERE post='1';
-ERROR 42S22: Unknown column 'post' in 'where clause'
+ERROR 42S22: Unknown column 'post' in 'WHERE'
 drop table t1;
 CREATE TABLE t1 (
 bool     char(0) default NULL,
@@ -229,11 +229,11 @@ drop table t1;
 CREATE TABLE t1 (a INT);
 INSERT INTO t1 VALUES (1);
 DELETE FROM t1 ORDER BY x;
-ERROR 42S22: Unknown column 'x' in 'order clause'
+ERROR 42S22: Unknown column 'x' in 'ORDER BY'
 DELETE FROM t1 ORDER BY t2.x;
-ERROR 42S22: Unknown column 't2.x' in 'order clause'
+ERROR 42S22: Unknown column 't2.x' in 'ORDER BY'
 DELETE FROM t1 ORDER BY (SELECT x);
-ERROR 42S22: Unknown column 'x' in 'field list'
+ERROR 42S22: Unknown column 'x' in 'SELECT'
 DROP TABLE t1;
 CREATE TABLE t1 (
 a INT
diff --git a/mysql-test/main/delete_returning.result b/mysql-test/main/delete_returning.result
index 3a95de0cdca..fc6e61fce83 100644
--- a/mysql-test/main/delete_returning.result
+++ b/mysql-test/main/delete_returning.result
@@ -42,7 +42,7 @@ a	b
 5	EEEEE
 7	GGGGGGG
 DELETE FROM t1 WHERE a=2 RETURNING c;
-ERROR 42S22: Unknown column 'c' in 'field list'
+ERROR 42S22: Unknown column 'c' in 'RETURNING'
 INSERT INTO t1 VALUES (2,'BB'), (2,'bb');
 DELETE FROM t1 WHERE a=2 RETURNING a, UPPER(b);
 a	UPPER(b)
diff --git a/mysql-test/main/derived.result b/mysql-test/main/derived.result
index cda21e275ae..09f273fced5 100644
--- a/mysql-test/main/derived.result
+++ b/mysql-test/main/derived.result
@@ -5,9 +5,9 @@ select * from (select 2 from DUAL) b;
 2
 2
 SELECT 1 as a FROM (SELECT 1 UNION SELECT a) b;
-ERROR 42S22: Unknown column 'a' in 'field list'
+ERROR 42S22: Unknown column 'a' in 'SELECT'
 SELECT 1 as a FROM (SELECT a UNION SELECT 1) b;
-ERROR 42S22: Unknown column 'a' in 'field list'
+ERROR 42S22: Unknown column 'a' in 'SELECT'
 CREATE TABLE t1 (a int not null, b char (10) not null);
 insert into t1 values(1,'a'),(2,'b'),(3,'c'),(3,'c');
 CREATE TABLE t2 (a int not null, b char (10) not null);
@@ -27,18 +27,18 @@ a	y
 3	3
 3	3
 SELECT a FROM (SELECT 1 FROM (SELECT 1) a HAVING a=1) b;
-ERROR 42S22: Unknown column 'a' in 'having clause'
+ERROR 42S22: Unknown column 'a' in 'HAVING'
 SELECT a,b as a FROM (SELECT '1' as a,'2' as b) b  HAVING a=1;
-ERROR 23000: Column 'a' in having clause is ambiguous
+ERROR 23000: Column 'a' in HAVING is ambiguous
 SELECT a,2 as a FROM (SELECT '1' as a) b HAVING a=2;
 a	a
 1	2
 SELECT a,2 as a FROM (SELECT '1' as a) b HAVING a=1;
 a	a
 SELECT 1 FROM (SELECT 1) a WHERE a=2;
-ERROR 42S22: Unknown column 'a' in 'where clause'
+ERROR 42S22: Unknown column 'a' in 'WHERE'
 SELECT (SELECT 1) as a FROM (SELECT 1 FROM t1  HAVING a=1) as a;
-ERROR 42S22: Unknown column 'a' in 'having clause'
+ERROR 42S22: Unknown column 'a' in 'HAVING'
 select * from t1 as x1, (select * from t1) as x2;
 a	b	a	b
 1	a	1	a
@@ -154,13 +154,13 @@ select * from (select 1 as a) b  left join (select 2 as a) c using(a);
 a
 1
 SELECT * FROM (SELECT 1 UNION SELECT a) b;
-ERROR 42S22: Unknown column 'a' in 'field list'
+ERROR 42S22: Unknown column 'a' in 'SELECT'
 SELECT 1 as a FROM (SELECT a UNION SELECT 1) b;
-ERROR 42S22: Unknown column 'a' in 'field list'
+ERROR 42S22: Unknown column 'a' in 'SELECT'
 SELECT 1 as a FROM (SELECT 1 UNION SELECT a) b;
-ERROR 42S22: Unknown column 'a' in 'field list'
+ERROR 42S22: Unknown column 'a' in 'SELECT'
 select 1 from  (select 2) a order by 0;
-ERROR 42S22: Unknown column '0' in 'order clause'
+ERROR 42S22: Unknown column '0' in 'ORDER BY'
 create table t1 (id int);
 insert into t1 values (1),(2),(3);
 describe select * from (select * from t1 group by id) bar;
@@ -276,7 +276,7 @@ N	M
 UPDATE `t1` AS P1 INNER JOIN (SELECT N FROM `t1` GROUP BY N HAVING Count(M) > 1) AS P2 ON P1.N = P2.N SET P1.M = 2, P2.N = 2;
 ERROR HY000: The target table P2 of the UPDATE is not updatable
 UPDATE `t1` AS P1 INNER JOIN (SELECT aaaa FROM `t1` GROUP BY N HAVING Count(M) > 1) AS P2 ON P1.N = P2.N SET P1.M = 2;
-ERROR 42S22: Unknown column 'aaaa' in 'field list'
+ERROR 42S22: Unknown column 'aaaa' in 'SELECT'
 delete P1.* from `t1` AS P1 INNER JOIN (SELECT N FROM `t1` GROUP BY N HAVING Count(M) > 1) AS P2 ON P1.N = P2.N;
 select * from t1;
 N	M
@@ -284,7 +284,7 @@ N	M
 delete P1.*,p2.* from `t1` AS P1 INNER JOIN (SELECT N FROM `t1` GROUP BY N HAVING Count(M) > 1) AS p2 ON P1.N = p2.N;
 ERROR HY000: The target table p2 of the DELETE is not updatable
 delete P1.* from `t1` AS P1 INNER JOIN (SELECT aaa FROM `t1` GROUP BY N HAVING Count(M) > 1) AS P2 ON P1.N = P2.N;
-ERROR 42S22: Unknown column 'aaa' in 'field list'
+ERROR 42S22: Unknown column 'aaa' in 'SELECT'
 drop table t1;
 CREATE TABLE t1 (
 OBJECTID int(11) NOT NULL default '0',
@@ -467,7 +467,7 @@ t1.id=t3.val
 set 
 t1.val=t3.val
 ;
-ERROR 42S22: Unknown column 'v.val' in 'field list'
+ERROR 42S22: Unknown column 'v.val' in 'SELECT'
 drop table t1, t2;
 #
 # MDEV-5353: server crash on subselect if WHERE applied to some
@@ -1336,7 +1336,7 @@ DROP TABLE t1;
 SELECT 1 FROM (
 SELECT 1 UNION SELECT 2 ORDER BY  (SELECT 1 FROM DUAL WHERE xxx = 0)
 ) dt;
-ERROR 42S22: Unknown column 'xxx' in 'where clause'
+ERROR 42S22: Unknown column 'xxx' in 'WHERE'
 create table t1 (a int, b int);
 insert into t1 values (3,8), (7,2), (1,4), (5,9);
 create table t2 (a int, b int);
@@ -1350,7 +1350,7 @@ union
 select a,b from t2 where t2.b < 6
 order by (a - b / (select a + max(c) from t3  where d = x))
 ) dt;
-ERROR 42S22: Unknown column 'x' in 'where clause'
+ERROR 42S22: Unknown column 'x' in 'WHERE'
 drop table t1,t2,t3;
 #
 # End of 10.3 tests
diff --git a/mysql-test/main/dyncol.result b/mysql-test/main/dyncol.result
index 5c4772a1947..13c0e18f63a 100644
--- a/mysql-test/main/dyncol.result
+++ b/mysql-test/main/dyncol.result
@@ -1621,7 +1621,7 @@ ex
 # as a dynamic column name
 #
 select COLUMN_CREATE(color, "black");
-ERROR 42S22: Unknown column 'color' in 'field list'
+ERROR 42S22: Unknown column 'color' in 'SELECT'
 #
 # MDEV-489 Assertion `offset < 0x1f' failed in
 # type_and_offset_store on COLUMN_ADD
diff --git a/mysql-test/main/errors.result b/mysql-test/main/errors.result
index baa2e0ad3c0..3f5827c16ed 100644
--- a/mysql-test/main/errors.result
+++ b/mysql-test/main/errors.result
@@ -7,21 +7,21 @@ update t1 set a=1;
 ERROR 42S02: Table 'test.t1' doesn't exist
 create table t1 (a int);
 select count(test.t1.b) from t1;
-ERROR 42S22: Unknown column 'test.t1.b' in 'field list'
+ERROR 42S22: Unknown column 'test.t1.b' in 'SELECT'
 select count(not_existing_database.t1) from t1;
-ERROR 42S22: Unknown column 'not_existing_database.t1' in 'field list'
+ERROR 42S22: Unknown column 'not_existing_database.t1' in 'SELECT'
 select count(not_existing_database.t1.a) from t1;
-ERROR 42S22: Unknown column 'not_existing_database.t1.a' in 'field list'
+ERROR 42S22: Unknown column 'not_existing_database.t1.a' in 'SELECT'
 select count(not_existing_database.t1.a) from not_existing_database.t1;
 Got one of the listed errors
 select 1 from t1 order by 2;
-ERROR 42S22: Unknown column '2' in 'order clause'
+ERROR 42S22: Unknown column '2' in 'ORDER BY'
 select 1 from t1 group by 2;
-ERROR 42S22: Unknown column '2' in 'group statement'
+ERROR 42S22: Unknown column '2' in 'GROUP BY'
 select 1 from t1 order by t1.b;
-ERROR 42S22: Unknown column 't1.b' in 'order clause'
+ERROR 42S22: Unknown column 't1.b' in 'ORDER BY'
 select count(*),b from t1;
-ERROR 42S22: Unknown column 'b' in 'field list'
+ERROR 42S22: Unknown column 'b' in 'SELECT'
 drop table t1;
 create table t1 (a int(256));
 ERROR 42000: Display width out of range for 'a' (max = 255)
@@ -45,17 +45,17 @@ Warning	1365	Division by 0
 DROP TABLE t1;
 CREATE TABLE t1( a INT );
 SELECT b FROM t1;
-ERROR 42S22: Unknown column 'b' in 'field list'
+ERROR 42S22: Unknown column 'b' in 'SELECT'
 SHOW ERRORS;
 Level	Code	Message
-Error	1054	Unknown column 'b' in 'field list'
+Error	1054	Unknown column 'b' in 'SELECT'
 CREATE TABLE t2 SELECT b FROM t1;
-ERROR 42S22: Unknown column 'b' in 'field list'
+ERROR 42S22: Unknown column 'b' in 'SELECT'
 SHOW ERRORS;
 Level	Code	Message
-Error	1054	Unknown column 'b' in 'field list'
+Error	1054	Unknown column 'b' in 'SELECT'
 INSERT INTO t1 SELECT b FROM t1;
-ERROR 42S22: Unknown column 'b' in 'field list'
+ERROR 42S22: Unknown column 'b' in 'SELECT'
 DROP TABLE t1;
 flush status;
 drop table if exists t1, t2;
diff --git a/mysql-test/main/explain.result b/mysql-test/main/explain.result
index 75d46110c35..ab69ea174ba 100644
--- a/mysql-test/main/explain.result
+++ b/mysql-test/main/explain.result
@@ -205,7 +205,7 @@ INSERT INTO t1 VALUES (repeat('b',@@global.max_allowed_packet));
 EXPLAIN SELECT DISTINCT 1 FROM t1,
 (SELECT DISTINCTROW a AS away FROM t1 GROUP BY a WITH ROLLUP) as d1
 WHERE t1.a = d1.a;
-ERROR 42S22: Unknown column 'd1.a' in 'where clause'
+ERROR 42S22: Unknown column 'd1.a' in 'WHERE'
 DROP TABLE t1;
 #
 # Bug#48295:
diff --git a/mysql-test/main/fulltext_order_by.result b/mysql-test/main/fulltext_order_by.result
index 35ae8789c7d..e3476bd2f5e 100644
--- a/mysql-test/main/fulltext_order_by.result
+++ b/mysql-test/main/fulltext_order_by.result
@@ -126,7 +126,7 @@ group by
 a.text, b.id, b.betreff
 order by 
 match(b.betreff) against ('+abc' in boolean mode) desc;
-ERROR 42000: Table 'b' from one of the SELECTs cannot be used in order clause
+ERROR 42000: Table 'b' from one of the SELECTs cannot be used in ORDER BY
 select a.text, b.id, b.betreff
 from 
 t2 a inner join t3 b on a.id = b.forum inner join
@@ -142,7 +142,7 @@ where
 match(c.beitrag) against ('+abc' in boolean mode)
 order by 
 match(b.betreff) against ('+abc' in boolean mode) desc;
-ERROR 42000: Table 'b' from one of the SELECTs cannot be used in order clause
+ERROR 42000: Table 'b' from one of the SELECTs cannot be used in ORDER BY
 select a.text, b.id, b.betreff
 from 
 t2 a inner join t3 b on a.id = b.forum inner join
diff --git a/mysql-test/main/func_gconcat.result b/mysql-test/main/func_gconcat.result
index 6226f95df23..d725029a533 100644
--- a/mysql-test/main/func_gconcat.result
+++ b/mysql-test/main/func_gconcat.result
@@ -160,7 +160,7 @@ set group_concat_max_len = 1024;
 select group_concat(sum(c)) from t1 group by grp;
 ERROR HY000: Invalid use of group function
 select grp,group_concat(c order by 2) from t1 group by grp;
-ERROR 42S22: Unknown column '2' in 'order clause'
+ERROR 42S22: Unknown column '2' in 'ORDER BY'
 drop table t1;
 create table t1 ( URL_ID int(11), URL varchar(80));
 create table t2 ( REQ_ID int(11), URL_ID int(11));
diff --git a/mysql-test/main/func_math.result b/mysql-test/main/func_math.result
index 4296a983d71..405bcc45ddb 100644
--- a/mysql-test/main/func_math.result
+++ b/mysql-test/main/func_math.result
@@ -154,7 +154,7 @@ id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 Warnings:
 Note	1003	select degrees(pi()) AS `degrees(pi())`,radians(360) AS `radians(360)`
 select rand(rand);
-ERROR 42S22: Unknown column 'rand' in 'field list'
+ERROR 42S22: Unknown column 'rand' in 'SELECT'
 create table t1 (col1 int, col2 decimal(60,30));
 insert into t1 values(1,1234567890.12345);
 select format(col2,7) from t1;
diff --git a/mysql-test/main/get_diagnostics.result b/mysql-test/main/get_diagnostics.result
index b00378d4ee9..6ea8d483da1 100644
--- a/mysql-test/main/get_diagnostics.result
+++ b/mysql-test/main/get_diagnostics.result
@@ -134,7 +134,7 @@ DROP PROCEDURE p1;
 GET DIAGNOSTICS CONDITION;
 ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '' at line 1
 GET DIAGNOSTICS CONDITION a;
-ERROR 42S22: Unknown column 'a' in 'field list'
+ERROR 42S22: Unknown column 'a' in 'GET DIAGNOSTICS'
 GET DIAGNOSTICS CONDITION 1;
 ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '' at line 1
 GET DIAGNOSTICS CONDITION 1 @var;
@@ -213,9 +213,9 @@ ERROR 42000: You have an error in your SQL syntax; check the manual that corresp
 GET DIAGNOSTICS CONDITION (1) @var = CLASS_ORIGIN;
 ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '(1) @var = CLASS_ORIGIN' at line 1
 GET DIAGNOSTICS CONDITION p1() @var = CLASS_ORIGIN;
-ERROR 42S22: Unknown column 'p1' in 'field list'
+ERROR 42S22: Unknown column 'p1' in 'GET DIAGNOSTICS'
 GET DIAGNOSTICS CONDITION ABS(2) @var = CLASS_ORIGIN;
-ERROR 42S22: Unknown column 'ABS' in 'field list'
+ERROR 42S22: Unknown column 'ABS' in 'GET DIAGNOSTICS'
 GET DIAGNOSTICS CONDITION 1.1 @var = CLASS_ORIGIN;
 GET DIAGNOSTICS CONDITION "1" @var = CLASS_ORIGIN;
 SELECT COUNT(max_questions) INTO @var FROM mysql.user;
@@ -227,7 +227,7 @@ Warnings:
 Error	1758	Invalid condition number
 Error	1758	Invalid condition number
 GET DIAGNOSTICS CONDITION a @var = CLASS_ORIGIN;
-ERROR 42S22: Unknown column 'a' in 'field list'
+ERROR 42S22: Unknown column 'a' in 'GET DIAGNOSTICS'
 SELECT COUNT(max_questions) INTO @var FROM mysql.user;
 SET @cond = 1;
 GET DIAGNOSTICS CONDITION @cond @var1 = CLASS_ORIGIN;
diff --git a/mysql-test/main/group_by.result b/mysql-test/main/group_by.result
index b7bbab6dd47..897e684936f 100644
--- a/mysql-test/main/group_by.result
+++ b/mysql-test/main/group_by.result
@@ -790,7 +790,7 @@ SELECT n+1 AS n FROM t1 GROUP BY n;
 n
 2
 Warnings:
-Warning	1052	Column 'n' in group statement is ambiguous
+Warning	1052	Column 'n' in GROUP BY is ambiguous
 DROP TABLE t1;
 create table t1(f1 varchar(5) key);
 insert into t1 values (1),(2);
@@ -877,10 +877,10 @@ c2
 aaa
 aaa
 Warnings:
-Warning	1052	Column 'c2' in group statement is ambiguous
+Warning	1052	Column 'c2' in GROUP BY is ambiguous
 show warnings;
 Level	Code	Message
-Warning	1052	Column 'c2' in group statement is ambiguous
+Warning	1052	Column 'c2' in GROUP BY is ambiguous
 select t1.c1 as c2 from t1, t2 where t1.c2 = t2.c4
 group by t1.c1;
 c2
@@ -1028,7 +1028,7 @@ FROM t1 AS t1_outer GROUP BY t1_outer.b;
 ERROR 42000: 'test.t1_outer.a' isn't in GROUP BY
 SELECT 1 FROM t1 as t1_outer GROUP BY a 
 HAVING (SELECT t1_outer.b FROM t1 AS t1_inner LIMIT 1);
-ERROR 42S22: Unknown column 'test.t1_outer.b' in 'field list'
+ERROR 42S22: Unknown column 'test.t1_outer.b' in 'SELECT'
 SELECT (SELECT SUM(t1_inner.a) FROM t1 AS t1_inner LIMIT 1) 
 FROM t1 AS t1_outer GROUP BY t1_outer.b;
 (SELECT SUM(t1_inner.a) FROM t1 AS t1_inner LIMIT 1)
@@ -1070,7 +1070,7 @@ SELECT 1 FROM t1 GROUP BY b HAVING ROW (b,b) = ROW (1,1);
 1
 1
 SELECT 1 FROM t1 GROUP BY b HAVING a = 2;
-ERROR 42S22: Unknown column 'a' in 'having clause'
+ERROR 42S22: Unknown column 'a' in 'HAVING'
 SELECT 1 FROM t1 GROUP BY SUM(b);
 ERROR HY000: Invalid use of group function
 SELECT b FROM t1 AS t1_outer GROUP BY a HAVING t1_outer.a IN 
@@ -2559,7 +2559,7 @@ DROP TABLE t1,t2;
 # MDEV-5104 crash in Item_field::used_tables with broken order by
 #
 (select 1 order by x(y)) order by 1;
-ERROR 42S22: Unknown column 'y' in 'order clause'
+ERROR 42S22: Unknown column 'y' in 'ORDER BY'
 # End of 5.3 tests
 #
 # Bug#49771: Incorrect MIN (date) when minimum value is 0000-00-00
diff --git a/mysql-test/main/having.result b/mysql-test/main/having.result
index 3e69b3bf2c8..f1f3190a08e 100644
--- a/mysql-test/main/having.result
+++ b/mysql-test/main/having.result
@@ -200,7 +200,7 @@ select count(*) from t1 group by col2 having col2 = 'hello';
 count(*)
 3
 select count(*) from t1 group by col2 having col1 = 10;
-ERROR 42S22: Unknown column 'col1' in 'having clause'
+ERROR 42S22: Unknown column 'col1' in 'HAVING'
 select col1 as count_col1 from t1 as tmp1 group by col1 having col1 = 10;
 count_col1
 10
@@ -241,7 +241,7 @@ select sum(col1) as co2, count(col2) as cc from t1 group by col1 having col1 =10
 co2	cc
 40	4
 select t2.col2 from t2 group by t2.col1, t2.col2 having t1.col1 <= 10;
-ERROR 42S22: Unknown column 't1.col1' in 'having clause'
+ERROR 42S22: Unknown column 't1.col1' in 'HAVING'
 select t1.col1 from t1
 where t1.col2 in 
 (select t2.col2 from t2 
@@ -279,7 +279,7 @@ select t1.col1 as tmp_col from t1
 where t1.col2 in 
 (select t2.col2 from t2 
 group by t2.col1, t2.col2 having tmp_col <= 10);
-ERROR 42S22: Unknown column 'tmp_col' in 'having clause'
+ERROR 42S22: Unknown column 'tmp_col' in 'HAVING'
 select t1.col1 from t1
 where t1.col2 in 
 (select t2.col2 from t2 
@@ -301,7 +301,7 @@ where t1.col2 in
 (select t2.col2 from t2 
 group by t2.col1, t2.col2 having col_t1 <= 10)
 having col_t1 <= 20;
-ERROR 42S22: Unknown column 'col_t1' in 'having clause'
+ERROR 42S22: Unknown column 'col_t1' in 'HAVING'
 select t1.col1 from t1
 where t1.col2 in 
 (select t2.col2 from t2 
@@ -322,7 +322,7 @@ select sum(col1) from t1
 group by col_t1
 having col_t1 in (select sum(t2.col1) from t2
 group by t2.col2, t2.col1 having t2.col1 = t1.col1);
-ERROR 42S22: Unknown column 't1.col1' in 'having clause'
+ERROR 42S22: Unknown column 't1.col1' in 'HAVING'
 select sum(col1) from t1
 group by col_t1
 having col_t1 in (select sum(t2.col1) from t2
@@ -333,10 +333,10 @@ sum(col1)
 30
 select t1.col1, t2.col1 from t1, t2 where t1.col1 = t2.col1
 group by t1.col1, t2.col1 having col1 = 2;
-ERROR 23000: Column 'col1' in having clause is ambiguous
+ERROR 23000: Column 'col1' in HAVING is ambiguous
 select t1.col1*10+t2.col1 from t1,t2 where t1.col1=t2.col1
 group by t1.col1, t2.col1 having col1 = 2;
-ERROR 23000: Column 'col1' in having clause is ambiguous
+ERROR 23000: Column 'col1' in HAVING is ambiguous
 drop table t1, t2, t3;
 create table t1 (s1 int);
 insert into t1 values (1),(2),(3);
@@ -348,8 +348,8 @@ s1
 0
 0
 Warnings:
-Warning	1052	Column 's1' in group statement is ambiguous
-Warning	1052	Column 's1' in having clause is ambiguous
+Warning	1052	Column 's1' in GROUP BY is ambiguous
+Warning	1052	Column 's1' in HAVING is ambiguous
 select s1*0 from t1 group by s1 having s1 = 0;
 s1*0
 select s1 from t1 group by 1 having 1 = 0;
@@ -362,7 +362,7 @@ count(s1)
 1
 1
 select * from t1 a, t1 b group by a.s1 having s1 is null;
-ERROR 23000: Column 's1' in having clause is ambiguous
+ERROR 23000: Column 's1' in HAVING is ambiguous
 drop table t1;
 create table t1 (s1 char character set latin1 collate latin1_german1_ci);
 insert ignore into t1 values ('ü'),('y');
diff --git a/mysql-test/main/host_cache_size_functionality.result b/mysql-test/main/host_cache_size_functionality.result
index f5d7e7ee109..844339acea7 100644
--- a/mysql-test/main/host_cache_size_functionality.result
+++ b/mysql-test/main/host_cache_size_functionality.result
@@ -68,6 +68,6 @@ COUNT(@@GLOBAL.Host_Cache_Size)
 1
 1 Expected
 SELECT Host_Cache_Size = @@SESSION.Host_Cache_Size;
-ERROR 42S22: Unknown column 'Host_Cache_Size' in 'field list'
+ERROR 42S22: Unknown column 'Host_Cache_Size' in 'SELECT'
 Expected error 'Unknown column Host_Cache_Size in field list'
 SET @@GLOBAL.Host_Cache_Size=DEFAULT;
diff --git a/mysql-test/main/insert.result b/mysql-test/main/insert.result
index 586dbbff153..f1eb9801e2a 100644
--- a/mysql-test/main/insert.result
+++ b/mysql-test/main/insert.result
@@ -766,14 +766,14 @@ create table t3 (c int);
 create table t4 (d1 int, d2 int);
 insert into t4
 select * from t1 left join t2 on (select t1.i from t3);
-ERROR 42S22: Unknown column 't1.i' in 'field list'
+ERROR 42S22: Unknown column 't1.i' in 'SELECT'
 replace t4
 select * from t1 left join t2 on (select t1.i from t3);
-ERROR 42S22: Unknown column 't1.i' in 'field list'
+ERROR 42S22: Unknown column 't1.i' in 'SELECT'
 drop table t1,t2,t3,t4;
 create table t (a int);
 select 1 in (select count(*) from t t1 join (t t2 join t t3 on (t1.a != 0)));
-ERROR 42S22: Unknown column 't1.a' in 'on clause'
+ERROR 42S22: Unknown column 't1.a' in 'ON'
 drop table t;
 #
 # MDEV-28578 Server crashes in Item_field::fix_outer_field after CREATE SELECT
@@ -781,7 +781,7 @@ drop table t;
 create table t1 (i int) ;
 create table t2 (j int) ;
 create table t4 select * from t1 join t2 on (select t3.i);
-ERROR 42S22: Unknown column 't3.i' in 'field list'
+ERROR 42S22: Unknown column 't3.i' in 'SELECT'
 drop table t1, t2;
 #
 # End of 10.4 tests
diff --git a/mysql-test/main/insert_returning.result b/mysql-test/main/insert_returning.result
index b2ed9c90e51..b35fd3bf35f 100644
--- a/mysql-test/main/insert_returning.result
+++ b/mysql-test/main/insert_returning.result
@@ -482,7 +482,7 @@ INSERT INTO t1 VALUES(1,'a'),(2,'b'),(3,'c');
 # SIMLPE INSERT STATEMENT
 #
 INSERT INTO t2(id2,val2) VALUES(1,'a') RETURNING id1;
-ERROR 42S22: Unknown column 'id1' in 'field list'
+ERROR 42S22: Unknown column 'id1' in 'RETURNING'
 INSERT INTO t2(id2,val2) values(2,'b') RETURNING SUM(id2);
 ERROR HY000: Invalid use of group function
 INSERT INTO t2(id2,val2) VALUES(3,'c') RETURNING (SELECT id1 FROM t1);
@@ -504,7 +504,7 @@ ERROR 42S02: Unknown table 'test.t1'
 # Multiple rows in single insert statement
 #
 INSERT INTO t2 VALUES(1,'a'),(2,'b') RETURNING id1;
-ERROR 42S22: Unknown column 'id1' in 'field list'
+ERROR 42S22: Unknown column 'id1' in 'RETURNING'
 INSERT INTO t2 VALUES(3,'c'),(4,'d') RETURNING MAX(id2);
 ERROR HY000: Invalid use of group function
 INSERT INTO t2 VALUES(5,'c'),(6,'f') RETURNING (SELECT id1 FROM t1);
@@ -527,7 +527,7 @@ ERROR 42S02: Unknown table 'test.t1'
 # INSERT ... SET
 #
 INSERT INTO t2 SET id2=1, val2='a' RETURNING id1;
-ERROR 42S22: Unknown column 'id1' in 'field list'
+ERROR 42S22: Unknown column 'id1' in 'RETURNING'
 INSERT INTO t2 SET id2=2, val2='b' RETURNING COUNT(id2);
 ERROR HY000: Invalid use of group function
 INSERT INTO t2 SET id2=3, val2='c' RETURNING (SELECT id1 FROM t1);
@@ -550,7 +550,7 @@ ERROR 42S02: Unknown table 'test.t1'
 #
 INSERT INTO ins_duplicate VALUES (2,'b') ON DUPLICATE KEY UPDATE val='b'
 RETURNING id1;
-ERROR 42S22: Unknown column 'id1' in 'field list'
+ERROR 42S22: Unknown column 'id1' in 'RETURNING'
 INSERT INTO ins_duplicate VALUES (2,'b') ON DUPLICATE KEY UPDATE val='b'
 RETURNING MAX(id);
 ERROR HY000: Invalid use of group function
@@ -565,7 +565,7 @@ RETURNING (SELECT * FROM ins_duplicate);
 ERROR 21000: Operand should contain 1 column(s)
 INSERT INTO ins_duplicate VALUES(2,'b') ON DUPLICATE KEY UPDATE val='b'
 RETURNING id2, (SELECT id1+id FROM t1 WHERE id1=1);
-ERROR 42S22: Unknown column 'id2' in 'field list'
+ERROR 42S22: Unknown column 'id2' in 'RETURNING'
 INSERT INTO ins_duplicate VALUES(2,'b') ON DUPLICATE KEY UPDATE val='b'
 RETURNING (SELECT id FROM ins_duplicate);
 ERROR HY000: Table 'ins_duplicate' is specified twice, both as a target for 'INSERT' and as a separate source for data
@@ -576,7 +576,7 @@ ERROR 42S02: Unknown table 'test.t1'
 # INSERT...SELECT
 #
 INSERT INTO t2(id2, val2) SELECT * FROM t1 WHERE id1=1 RETURNING id1;
-ERROR 42S22: Unknown column 'id1' in 'field list'
+ERROR 42S22: Unknown column 'id1' in 'RETURNING'
 INSERT INTO t2(id2, val2) SELECT * FROM t1 WHERE id1=2 RETURNING MAX(id2);
 ERROR HY000: Invalid use of group function
 INSERT INTO t2(id2, val2) SELECT * FROM t1 WHERE id1=2 RETURNING (SELECT
diff --git a/mysql-test/main/insert_select.result b/mysql-test/main/insert_select.result
index 463f571b096..eba5d4bbf9e 100644
--- a/mysql-test/main/insert_select.result
+++ b/mysql-test/main/insert_select.result
@@ -666,11 +666,11 @@ a
 10
 insert into t1 select t2.a from t2 group by t2.a on duplicate key update a= a + 10;
 insert into t1 select t2.a from t2 on duplicate key update a= a + t2.b;
-ERROR 23000: Column 'a' in field list is ambiguous
+ERROR 23000: Column 'a' in UPDATE is ambiguous
 insert into t1 select t2.a from t2 on duplicate key update t2.a= a + t2.b;
-ERROR 42S22: Unknown column 't2.a' in 'field list'
+ERROR 42S22: Unknown column 't2.a' in 'UPDATE'
 insert into t1 select t2.a from t2 group by t2.a on duplicate key update a= t1.a + t2.b;
-ERROR 42S22: Unknown column 't2.b' in 'field list'
+ERROR 42S22: Unknown column 't2.b' in 'UPDATE'
 drop table t1,t2,t3;
 create table t1(f1 varchar(5) key);
 insert into t1(f1) select if(max(f1) is null, '2000',max(f1)+1) from t1;
@@ -686,9 +686,9 @@ create table t1(x int, y int);
 create table t2(x int, z int);
 insert into t1(x,y) select x,z from t2 on duplicate key update x=values(x);
 insert into t1(x,y) select x,z from t2 on duplicate key update x=values(z);
-ERROR 42S22: Unknown column 'z' in 'field list'
+ERROR 42S22: Unknown column 'z' in 'UPDATE'
 insert into t1(x,y) select x,z from t2 on duplicate key update x=values(t2.x);
-ERROR 42S22: Unknown column 't2.x' in 'field list'
+ERROR 42S22: Unknown column 't2.x' in 'UPDATE'
 drop table t1,t2;
 CREATE TABLE t1 (a int PRIMARY KEY);
 INSERT INTO t1 values (1), (2);
diff --git a/mysql-test/main/insert_update.result b/mysql-test/main/insert_update.result
index 83344971c59..b075a9f27b3 100644
--- a/mysql-test/main/insert_update.result
+++ b/mysql-test/main/insert_update.result
@@ -158,7 +158,7 @@ a	b	c
 5	0	30
 8	9	60
 INSERT t1 SELECT a,b,c FROM t2 WHERE d=2 ON DUPLICATE KEY UPDATE c=c+VALUES(a);
-ERROR 23000: Column 'c' in field list is ambiguous
+ERROR 23000: Column 'c' in UPDATE is ambiguous
 INSERT t1 SELECT a,b,c FROM t2 WHERE d=2 ON DUPLICATE KEY UPDATE c=t1.c+VALUES(t1.a);
 SELECT *, VALUE(a) FROM t1;
 a	b	c	VALUE(a)
@@ -191,9 +191,9 @@ a
 2
 3
 insert into t1 select a from t1 on duplicate key update a=a+1 ;
-ERROR 23000: Column 'a' in field list is ambiguous
+ERROR 23000: Column 'a' in UPDATE is ambiguous
 insert ignore into t1 select a from t1 on duplicate key update a=t1.a+1 ;
-ERROR 23000: Column 't1.a' in field list is ambiguous
+ERROR 23000: Column 't1.a' in UPDATE is ambiguous
 drop table t1;
 CREATE TABLE t1 (
 a BIGINT(20) NOT NULL DEFAULT 0,
@@ -225,7 +225,7 @@ a	b
 DROP TABLE t1;
 CREATE TABLE t1 (i INT PRIMARY KEY, j INT);
 INSERT INTO t1 SELECT 1, j;
-ERROR 42S22: Unknown column 'j' in 'field list'
+ERROR 42S22: Unknown column 'j' in 'SELECT'
 DROP TABLE t1;
 CREATE TABLE t1 (i INT PRIMARY KEY, j INT);
 CREATE TABLE t2 (a INT, b INT);
@@ -238,7 +238,7 @@ CREATE TABLE t2 (a INT);
 INSERT INTO t1 VALUES (1, 1);
 INSERT INTO t2 VALUES (1), (3);
 INSERT INTO t1 SELECT 1, COUNT(*) FROM t2 ON DUPLICATE KEY UPDATE j= a;
-ERROR 42S22: Unknown column 'a' in 'field list'
+ERROR 42S22: Unknown column 'a' in 'UPDATE'
 DROP TABLE t1,t2;
 SET SQL_MODE = 'TRADITIONAL';
 CREATE TABLE t1 (a INT PRIMARY KEY, b INT NOT NULL);
diff --git a/mysql-test/main/invisible_field.result b/mysql-test/main/invisible_field.result
index 7aa88e7787e..30f0564a34b 100644
--- a/mysql-test/main/invisible_field.result
+++ b/mysql-test/main/invisible_field.result
@@ -234,7 +234,7 @@ a	d	e	f
 1	d blob	3	1
 1	d blob	41	1
 select a,b,c,d,e,f from t2;
-ERROR 42S22: Unknown column 'b' in 'field list'
+ERROR 42S22: Unknown column 'b' in 'SELECT'
 drop table t2;
 #now this will copy invisible fields
 create table t2 as select a,b,c,d,e,f from t1;
@@ -310,7 +310,7 @@ a	d	e	f
 1	d blob	41	1
 #v does not have invisible column;
 select a,b,c,d,e,f from v;
-ERROR 42S22: Unknown column 'b' in 'field list'
+ERROR 42S22: Unknown column 'b' in 'SELECT'
 insert into v values(1,21,32,4);
 select * from v;
 a	d	e	f
@@ -321,7 +321,7 @@ a	d	e	f
 1	d blob	41	1
 1	21	32	4
 insert into v(a,b,c,d,e,f) values(1,12,3,4,5,6);
-ERROR 42S22: Unknown column 'b' in 'field list'
+ERROR 42S22: Unknown column 'b' in 'INSERT INTO'
 drop view v;
 create view v as select a,b,c,d,e,f from t1;
 desc v;
diff --git a/mysql-test/main/invisible_field_debug.result b/mysql-test/main/invisible_field_debug.result
index 344a0b860fc..882b7404ea8 100644
--- a/mysql-test/main/invisible_field_debug.result
+++ b/mysql-test/main/invisible_field_debug.result
@@ -16,16 +16,16 @@ select a , invisible from t1;
 a	invisible
 1	9
 insert into t1(a, invisible) values(99,99);
-ERROR 42S22: Unknown column 'invisible' in 'field list'
+ERROR 42S22: Unknown column 'invisible' in 'INSERT INTO'
 select default(invisible) from t1;
-ERROR 42S22: Unknown column 'invisible' in 'field list'
+ERROR 42S22: Unknown column 'invisible' in 'SELECT'
 insert into t1(invisible) values(99);
-ERROR 42S22: Unknown column 'invisible' in 'field list'
+ERROR 42S22: Unknown column 'invisible' in 'INSERT INTO'
 insert into t_tmp select a, invisible from t1;
 insert into t1 select * from t_tmp;
 ERROR 21S01: Column count doesn't match value count at row 1
 insert into t1(a,invisible) select * from t_tmp;
-ERROR 42S22: Unknown column 'invisible' in 'field list'
+ERROR 42S22: Unknown column 'invisible' in 'INSERT INTO'
 select a , invisible from t1;
 a	invisible
 1	9
@@ -45,22 +45,22 @@ select a , invisible from t1;
 a	invisible
 109	9
 update t1 set invisible = 23 where a=(select a from t1 limit 1);
-ERROR 42S22: Unknown column 'invisible' in 'field list'
+ERROR 42S22: Unknown column 'invisible' in 'SET'
 update t1 set invisible = 101 where a=(select a from t1 limit 1);
-ERROR 42S22: Unknown column 'invisible' in 'field list'
+ERROR 42S22: Unknown column 'invisible' in 'SET'
 update t1 set invisible = (select invisible+100 from t1 limit 1) where a=(select invisible from t1 limit 1);
-ERROR 42S22: Unknown column 'invisible' in 'field list'
+ERROR 42S22: Unknown column 'invisible' in 'SET'
 select a , invisible from t1;
 a	invisible
 109	9
 set @a=12;
 update t1 set invisible = (select @a from dual) where a=(select a from t1 limit 1);
-ERROR 42S22: Unknown column 'invisible' in 'field list'
+ERROR 42S22: Unknown column 'invisible' in 'SET'
 select a , invisible from t1;
 a	invisible
 109	9
 update t1 set invisible = (select invisible+100 from t1 limit 1) where a=(select a from t1 limit 1);
-ERROR 42S22: Unknown column 'invisible' in 'field list'
+ERROR 42S22: Unknown column 'invisible' in 'SET'
 select a , invisible from t1;
 a	invisible
 109	9
@@ -100,7 +100,7 @@ select * from t1;
 a
 1
 select invisible ,a from t1;
-ERROR 42S22: Unknown column 'invisible' in 'field list'
+ERROR 42S22: Unknown column 'invisible' in 'SELECT'
 set debug_dbug= "+d,test_completely_invisible";
 select invisible ,a from t1;
 invisible	a
@@ -108,9 +108,9 @@ invisible	a
 set debug_dbug=@old_debug;
 create table t2 (invisible int);
 select * from t1 join t2 using (invisible);
-ERROR 42S22: Unknown column 'invisible' in 'from clause'
+ERROR 42S22: Unknown column 'invisible' in 'FROM'
 select * from t2 join t1 using (invisible);
-ERROR 42S22: Unknown column 'invisible' in 'from clause'
+ERROR 42S22: Unknown column 'invisible' in 'FROM'
 insert t2 values (8),(9);
 select * from t1 natural join t2;
 a	invisible
diff --git a/mysql-test/main/invisible_field_grant_completely.result b/mysql-test/main/invisible_field_grant_completely.result
index b1b313072b2..520d608ef71 100644
--- a/mysql-test/main/invisible_field_grant_completely.result
+++ b/mysql-test/main/invisible_field_grant_completely.result
@@ -40,7 +40,7 @@ a
 2
 3
 select invisible,a from t1;
-ERROR 42S22: Unknown column 'invisible' in 'field list'
+ERROR 42S22: Unknown column 'invisible' in 'SELECT'
 delete from t1 where a =1;
 update t1 set a=1 where a=3;
 select * from t1;
diff --git a/mysql-test/main/join.result b/mysql-test/main/join.result
index 9f843a7e722..44be0bcd9f8 100644
--- a/mysql-test/main/join.result
+++ b/mysql-test/main/join.result
@@ -727,31 +727,31 @@ b	c	a	c	b	y
 1	10	2	3	1	2
 1	3	2	3	1	2
 select * from t1 natural join (t3 cross join t4);
-ERROR 23000: Column 'c' in from clause is ambiguous
+ERROR 23000: Column 'c' in FROM is ambiguous
 select * from (t3 cross join t4) natural join t1;
-ERROR 23000: Column 'c' in from clause is ambiguous
+ERROR 23000: Column 'c' in FROM is ambiguous
 select * from t1 join (t2, t3) using (b);
-ERROR 23000: Column 'b' in from clause is ambiguous
+ERROR 23000: Column 'b' in FROM is ambiguous
 select * from ((t1 natural join t2), (t3 natural join t4)) natural join t6;
-ERROR 23000: Column 'c' in from clause is ambiguous
+ERROR 23000: Column 'c' in FROM is ambiguous
 select * from ((t1 natural join t2), (t3 natural join t4)) natural join t6;
-ERROR 23000: Column 'c' in from clause is ambiguous
+ERROR 23000: Column 'c' in FROM is ambiguous
 select * from t6 natural join ((t1 natural join t2),  (t3 natural join t4));
-ERROR 23000: Column 'c' in from clause is ambiguous
+ERROR 23000: Column 'c' in FROM is ambiguous
 select * from (t1 join t2 on t1.b=t2.b) natural join (t3 natural join t4);
-ERROR 23000: Column 'b' in from clause is ambiguous
+ERROR 23000: Column 'b' in FROM is ambiguous
 select * from  (t3 natural join t4) natural join (t1 join t2 on t1.b=t2.b);
-ERROR 23000: Column 'b' in from clause is ambiguous
+ERROR 23000: Column 'b' in FROM is ambiguous
 select * from (t3 join (t4 natural join t5) on (b < z))
 natural join
 (t1 natural join t2);
-ERROR 23000: Column 'c' in from clause is ambiguous
+ERROR 23000: Column 'c' in FROM is ambiguous
 select * from (t1 natural join t2) natural join (t3 join (t4 natural join t5) on (b < z));
-ERROR 23000: Column 'c' in from clause is ambiguous
+ERROR 23000: Column 'c' in FROM is ambiguous
 select t1.b from v1a;
-ERROR 42S22: Unknown column 't1.b' in 'field list'
+ERROR 42S22: Unknown column 't1.b' in 'SELECT'
 select * from v1a join v1b on t1.b = t2.b;
-ERROR 42S22: Unknown column 't1.b' in 'on clause'
+ERROR 42S22: Unknown column 't1.b' in 'ON'
 select 
 statistics.TABLE_NAME, statistics.COLUMN_NAME, statistics.TABLE_CATALOG, statistics.TABLE_SCHEMA, statistics.NON_UNIQUE, statistics.INDEX_SCHEMA, statistics.INDEX_NAME, statistics.SEQ_IN_INDEX, statistics.COLLATION, statistics.SUB_PART, statistics.PACKED, statistics.NULLABLE, statistics.INDEX_TYPE, statistics.COMMENT, 
 columns.TABLE_CATALOG, columns.TABLE_SCHEMA, columns.COLUMN_DEFAULT, columns.IS_NULLABLE, columns.DATA_TYPE, columns.CHARACTER_MAXIMUM_LENGTH, columns.CHARACTER_OCTET_LENGTH, columns.NUMERIC_PRECISION, columns.NUMERIC_SCALE, columns.CHARACTER_SET_NAME, columns.COLLATION_NAME, columns.COLUMN_TYPE, columns.COLUMN_KEY, columns.EXTRA, columns.COLUMN_COMMENT
@@ -1519,12 +1519,12 @@ SET optimizer_switch=@save_optimizer_switch;
 CREATE TABLE t (i INT);
 CREATE PROCEDURE p() SELECT t1.f FROM t AS t1 JOIN t AS t2 USING (f);
 CALL p;
-ERROR 42S22: Unknown column 'f' in 'from clause'
+ERROR 42S22: Unknown column 'f' in 'FROM'
 CALL p;
-ERROR 42S22: Unknown column 'f' in 'from clause'
+ERROR 42S22: Unknown column 'f' in 'FROM'
 FLUSH TABLES;
 CALL p;
-ERROR 42S22: Unknown column 'f' in 'from clause'
+ERROR 42S22: Unknown column 'f' in 'FROM'
 DROP TABLE t;
 CREATE TABLE t (f INT);
 CALL p;
@@ -1532,9 +1532,9 @@ f
 DROP TABLE t;
 CREATE TABLE t (i INT);
 CALL p;
-ERROR 42S22: Unknown column 't1.f' in 'field list'
+ERROR 42S22: Unknown column 't1.f' in 'SELECT'
 CALL p;
-ERROR 42S22: Unknown column 't1.f' in 'field list'
+ERROR 42S22: Unknown column 't1.f' in 'SELECT'
 DROP PROCEDURE p;
 DROP TABLE t;
 CREATE TABLE t1 (a INT, b INT);
@@ -1545,9 +1545,9 @@ CREATE TABLE t5 (a INT, c INT);
 CREATE PROCEDURE p1() SELECT c FROM t1 JOIN (t2 LEFT JOIN t3 USING (a) LEFT JOIN t4 USING (a)
 LEFT JOIN t5 USING (a)) USING (a);
 CALL p1;
-ERROR 23000: Column 'c' in field list is ambiguous
+ERROR 23000: Column 'c' in SELECT is ambiguous
 CALL p1;
-ERROR 23000: Column 'c' in field list is ambiguous
+ERROR 23000: Column 'c' in SELECT is ambiguous
 DROP PROCEDURE p1;
 DROP TABLE t1,t2,t3,t4,t5;
 #
diff --git a/mysql-test/main/join_nested.result b/mysql-test/main/join_nested.result
index 4db15f2f5a8..74a395b7271 100644
--- a/mysql-test/main/join_nested.result
+++ b/mysql-test/main/join_nested.result
@@ -1401,19 +1401,19 @@ SELECT e FROM t5 NATURAL JOIN t6;
 SELECT t1.a FROM t1 JOIN t2 ON a=b JOIN t3 ON a=c JOIN t4 USING(d);
 a
 SELECT t1.x FROM t1 JOIN t2 ON a=b JOIN t3 ON a=c JOIN t4 USING(d);
-ERROR 42S22: Unknown column 't1.x' in 'field list'
+ERROR 42S22: Unknown column 't1.x' in 'SELECT'
 SELECT t1.a FROM t1 JOIN t2 ON a=b JOIN t3 ON a=c NATURAL JOIN t4;
 a
 SELECT t1.x FROM t1 JOIN t2 ON a=b JOIN t3 ON a=c NATURAL JOIN t4;
-ERROR 42S22: Unknown column 't1.x' in 'field list'
+ERROR 42S22: Unknown column 't1.x' in 'SELECT'
 SELECT v1.e FROM v1 JOIN t2 ON e=b JOIN t3 ON e=c JOIN t4 USING(d);
 e
 SELECT v1.x FROM v1 JOIN t2 ON e=b JOIN t3 ON e=c JOIN t4 USING(d);
-ERROR 42S22: Unknown column 'v1.x' in 'field list'
+ERROR 42S22: Unknown column 'v1.x' in 'SELECT'
 SELECT v2.e FROM v2 JOIN t2 ON e=b JOIN t3 ON e=c JOIN t4 USING(d);
 e
 SELECT v2.x FROM v2 JOIN t2 ON e=b JOIN t3 ON e=c JOIN t4 USING(d);
-ERROR 42S22: Unknown column 'v2.x' in 'field list'
+ERROR 42S22: Unknown column 'v2.x' in 'SELECT'
 DROP VIEW v1, v2;
 DROP TABLE t1, t2, t3, t4, t5, t6;
 create table t1 (id1 int(11) not null);
@@ -1628,13 +1628,13 @@ LEFT JOIN t5 USING (a)) USING (a);
 b
 SELECT c FROM t1 JOIN (t2 LEFT JOIN t3 USING (a) LEFT JOIN t4 USING (a)
 LEFT JOIN t5 USING (a)) USING (a);
-ERROR 23000: Column 'c' in field list is ambiguous
+ERROR 23000: Column 'c' in SELECT is ambiguous
 SELECT b FROM t1 JOIN (t2 JOIN t3 USING (a) JOIN t4 USING (a)
 JOIN t5 USING (a)) USING (a);
 b
 SELECT c FROM t1 JOIN (t2 JOIN t3 USING (a) JOIN t4 USING (a)
 JOIN t5 USING (a)) USING (a);
-ERROR 23000: Column 'c' in field list is ambiguous
+ERROR 23000: Column 'c' in SELECT is ambiguous
 DROP TABLE t1,t2,t3,t4,t5;
 CREATE TABLE t1 (a INT, b INT);
 CREATE TABLE t2 (a INT, b INT);
@@ -1643,7 +1643,7 @@ INSERT INTO t1 VALUES (1,1);
 INSERT INTO t2 VALUES (1,1);
 INSERT INTO t3 VALUES (1,1);
 SELECT * FROM t1 JOIN (t2 JOIN t3 USING (b)) USING (a);
-ERROR 23000: Column 'a' in from clause is ambiguous
+ERROR 23000: Column 'a' in FROM is ambiguous
 DROP TABLE t1,t2,t3;
 CREATE TABLE t1 (
 carrier char(2) default NULL,
diff --git a/mysql-test/main/join_nested_jcl6.result b/mysql-test/main/join_nested_jcl6.result
index 26081382368..3223eb5203f 100644
--- a/mysql-test/main/join_nested_jcl6.result
+++ b/mysql-test/main/join_nested_jcl6.result
@@ -1410,19 +1410,19 @@ SELECT e FROM t5 NATURAL JOIN t6;
 SELECT t1.a FROM t1 JOIN t2 ON a=b JOIN t3 ON a=c JOIN t4 USING(d);
 a
 SELECT t1.x FROM t1 JOIN t2 ON a=b JOIN t3 ON a=c JOIN t4 USING(d);
-ERROR 42S22: Unknown column 't1.x' in 'field list'
+ERROR 42S22: Unknown column 't1.x' in 'SELECT'
 SELECT t1.a FROM t1 JOIN t2 ON a=b JOIN t3 ON a=c NATURAL JOIN t4;
 a
 SELECT t1.x FROM t1 JOIN t2 ON a=b JOIN t3 ON a=c NATURAL JOIN t4;
-ERROR 42S22: Unknown column 't1.x' in 'field list'
+ERROR 42S22: Unknown column 't1.x' in 'SELECT'
 SELECT v1.e FROM v1 JOIN t2 ON e=b JOIN t3 ON e=c JOIN t4 USING(d);
 e
 SELECT v1.x FROM v1 JOIN t2 ON e=b JOIN t3 ON e=c JOIN t4 USING(d);
-ERROR 42S22: Unknown column 'v1.x' in 'field list'
+ERROR 42S22: Unknown column 'v1.x' in 'SELECT'
 SELECT v2.e FROM v2 JOIN t2 ON e=b JOIN t3 ON e=c JOIN t4 USING(d);
 e
 SELECT v2.x FROM v2 JOIN t2 ON e=b JOIN t3 ON e=c JOIN t4 USING(d);
-ERROR 42S22: Unknown column 'v2.x' in 'field list'
+ERROR 42S22: Unknown column 'v2.x' in 'SELECT'
 DROP VIEW v1, v2;
 DROP TABLE t1, t2, t3, t4, t5, t6;
 create table t1 (id1 int(11) not null);
@@ -1637,13 +1637,13 @@ LEFT JOIN t5 USING (a)) USING (a);
 b
 SELECT c FROM t1 JOIN (t2 LEFT JOIN t3 USING (a) LEFT JOIN t4 USING (a)
 LEFT JOIN t5 USING (a)) USING (a);
-ERROR 23000: Column 'c' in field list is ambiguous
+ERROR 23000: Column 'c' in SELECT is ambiguous
 SELECT b FROM t1 JOIN (t2 JOIN t3 USING (a) JOIN t4 USING (a)
 JOIN t5 USING (a)) USING (a);
 b
 SELECT c FROM t1 JOIN (t2 JOIN t3 USING (a) JOIN t4 USING (a)
 JOIN t5 USING (a)) USING (a);
-ERROR 23000: Column 'c' in field list is ambiguous
+ERROR 23000: Column 'c' in SELECT is ambiguous
 DROP TABLE t1,t2,t3,t4,t5;
 CREATE TABLE t1 (a INT, b INT);
 CREATE TABLE t2 (a INT, b INT);
@@ -1652,7 +1652,7 @@ INSERT INTO t1 VALUES (1,1);
 INSERT INTO t2 VALUES (1,1);
 INSERT INTO t3 VALUES (1,1);
 SELECT * FROM t1 JOIN (t2 JOIN t3 USING (b)) USING (a);
-ERROR 23000: Column 'a' in from clause is ambiguous
+ERROR 23000: Column 'a' in FROM is ambiguous
 DROP TABLE t1,t2,t3;
 CREATE TABLE t1 (
 carrier char(2) default NULL,
diff --git a/mysql-test/main/join_outer.result b/mysql-test/main/join_outer.result
index 9722211fadf..03793cd81c5 100644
--- a/mysql-test/main/join_outer.result
+++ b/mysql-test/main/join_outer.result
@@ -110,11 +110,11 @@ grp	a	c	id	a	c	d	a
 3	6	D	3	6	C	6	6
 NULL	NULL		NULL	NULL	NULL	NULL	NULL
 explain select t1.*,t2.*,t3.a from t1 left join t2 on (t3.a=t2.a) left join t1 as t3 on (t1.a=t3.a);
-ERROR 42S22: Unknown column 't3.a' in 'on clause'
+ERROR 42S22: Unknown column 't3.a' in 'ON'
 select t1.*,t2.*,t3.a from t1 left join t2 on (t3.a=t2.a) left join t1 as t3 on (t1.a=t3.a);
-ERROR 42S22: Unknown column 't3.a' in 'on clause'
+ERROR 42S22: Unknown column 't3.a' in 'ON'
 select t1.*,t2.*,t3.a from t1 left join t2 on (t3.a=t2.a) left join t1 as t3 on (t2.a=t3.a);
-ERROR 42S22: Unknown column 't3.a' in 'on clause'
+ERROR 42S22: Unknown column 't3.a' in 'ON'
 select t1.*,t2.* from t1 inner join t2 using (a);
 grp	a	c	id	a	c	d
 1	1	a	1	1	a	1
@@ -404,7 +404,7 @@ insert into t3 values (1);
 insert into t4 values (1,1);
 insert into t5 values (1,1);
 explain select * from t3 left join t4 on t4.seq_1_id = t2.t2_id left join t1 on t1.t1_id = t4.seq_0_id left join t5 on t5.seq_0_id = t1.t1_id left join t2 on t2.t2_id = t5.seq_1_id where t3.t3_id = 23;
-ERROR 42S22: Unknown column 't2.t2_id' in 'on clause'
+ERROR 42S22: Unknown column 't2.t2_id' in 'ON'
 drop table t1,t2,t3,t4,t5;
 create table t1 (n int, m int, o int, key(n));
 create table t2 (n int not null, m int, o int, primary key(n));
@@ -2703,7 +2703,7 @@ join
 t3 on
 (t3.f=t1.a)
 ) on (t2.c=t1.a );
-ERROR 42S22: Unknown column 't1.a' in 'on clause'
+ERROR 42S22: Unknown column 't1.a' in 'ON'
 explain
 select *
 from
@@ -2713,7 +2713,7 @@ join
 t3 on
 (t3.f=(select max(g) from t4 where t4.h=t1.a))
 ) on (t2.c=t1.a );
-ERROR 42S22: Unknown column 't1.a' in 'where clause'
+ERROR 42S22: Unknown column 't1.a' in 'WHERE'
 drop table t1,t2,t3,t4;
 create table t1 (a int);
 insert into t1 values (1),(2);
@@ -2724,7 +2724,7 @@ insert into t3 values (1),(2);
 select * from ( select * from t1 left join t2
 on b in (select x from t3 as sq1)
 ) as sq2;
-ERROR 42S22: Unknown column 'x' in 'field list'
+ERROR 42S22: Unknown column 'x' in 'SELECT'
 drop table t1,t2,t3;
 # end of 10.2 tests
 #
diff --git a/mysql-test/main/join_outer_jcl6.result b/mysql-test/main/join_outer_jcl6.result
index 26865a72d47..e11434c2ea7 100644
--- a/mysql-test/main/join_outer_jcl6.result
+++ b/mysql-test/main/join_outer_jcl6.result
@@ -117,11 +117,11 @@ grp	a	c	id	a	c	d	a
 3	6	D	3	6	C	6	6
 NULL	NULL		NULL	NULL	NULL	NULL	NULL
 explain select t1.*,t2.*,t3.a from t1 left join t2 on (t3.a=t2.a) left join t1 as t3 on (t1.a=t3.a);
-ERROR 42S22: Unknown column 't3.a' in 'on clause'
+ERROR 42S22: Unknown column 't3.a' in 'ON'
 select t1.*,t2.*,t3.a from t1 left join t2 on (t3.a=t2.a) left join t1 as t3 on (t1.a=t3.a);
-ERROR 42S22: Unknown column 't3.a' in 'on clause'
+ERROR 42S22: Unknown column 't3.a' in 'ON'
 select t1.*,t2.*,t3.a from t1 left join t2 on (t3.a=t2.a) left join t1 as t3 on (t2.a=t3.a);
-ERROR 42S22: Unknown column 't3.a' in 'on clause'
+ERROR 42S22: Unknown column 't3.a' in 'ON'
 select t1.*,t2.* from t1 inner join t2 using (a);
 grp	a	c	id	a	c	d
 1	1	a	1	1	a	1
@@ -411,7 +411,7 @@ insert into t3 values (1);
 insert into t4 values (1,1);
 insert into t5 values (1,1);
 explain select * from t3 left join t4 on t4.seq_1_id = t2.t2_id left join t1 on t1.t1_id = t4.seq_0_id left join t5 on t5.seq_0_id = t1.t1_id left join t2 on t2.t2_id = t5.seq_1_id where t3.t3_id = 23;
-ERROR 42S22: Unknown column 't2.t2_id' in 'on clause'
+ERROR 42S22: Unknown column 't2.t2_id' in 'ON'
 drop table t1,t2,t3,t4,t5;
 create table t1 (n int, m int, o int, key(n));
 create table t2 (n int not null, m int, o int, primary key(n));
@@ -2710,7 +2710,7 @@ join
 t3 on
 (t3.f=t1.a)
 ) on (t2.c=t1.a );
-ERROR 42S22: Unknown column 't1.a' in 'on clause'
+ERROR 42S22: Unknown column 't1.a' in 'ON'
 explain
 select *
 from
@@ -2720,7 +2720,7 @@ join
 t3 on
 (t3.f=(select max(g) from t4 where t4.h=t1.a))
 ) on (t2.c=t1.a );
-ERROR 42S22: Unknown column 't1.a' in 'where clause'
+ERROR 42S22: Unknown column 't1.a' in 'WHERE'
 drop table t1,t2,t3,t4;
 create table t1 (a int);
 insert into t1 values (1),(2);
@@ -2731,7 +2731,7 @@ insert into t3 values (1),(2);
 select * from ( select * from t1 left join t2
 on b in (select x from t3 as sq1)
 ) as sq2;
-ERROR 42S22: Unknown column 'x' in 'field list'
+ERROR 42S22: Unknown column 'x' in 'SELECT'
 drop table t1,t2,t3;
 # end of 10.2 tests
 #
diff --git a/mysql-test/main/keywords.result b/mysql-test/main/keywords.result
index 4e246e38299..8f4ba9bb03c 100644
--- a/mysql-test/main/keywords.result
+++ b/mysql-test/main/keywords.result
@@ -579,62 +579,62 @@ SELECT test.year(); -- FUNCTION test.year does not exist. Check
 SELECT test.create(); -- FUNCTION test.create does not exist. Che
 CALL p2('SELECT $(VAR) FROM t1');
 --------
-SELECT non_keyword FROM t1; -- Unknown column 'non_keyword' in 'field l
+SELECT non_keyword FROM t1; -- Unknown column 'non_keyword' in 'SELECT'
 --------
-SELECT lpad FROM t1; -- Unknown column 'lpad' in 'field list'
+SELECT lpad FROM t1; -- Unknown column 'lpad' in 'SELECT'
 --------
-SELECT rpad FROM t1; -- Unknown column 'rpad' in 'field list'
+SELECT rpad FROM t1; -- Unknown column 'rpad' in 'SELECT'
 --------
-SELECT adddate FROM t1; -- Unknown column 'adddate' in 'field list'
+SELECT adddate FROM t1; -- Unknown column 'adddate' in 'SELECT'
 --------
-SELECT substr FROM t1; -- Unknown column 'substr' in 'field list'
+SELECT substr FROM t1; -- Unknown column 'substr' in 'SELECT'
 --------
-SELECT substring FROM t1; -- Unknown column 'substring' in 'field lis
+SELECT substring FROM t1; -- Unknown column 'substring' in 'SELECT'
 --------
-SELECT trim_oracle FROM t1; -- Unknown column 'trim_oracle' in 'field l
+SELECT trim_oracle FROM t1; -- Unknown column 'trim_oracle' in 'SELECT'
 --------
-SELECT ascii FROM t1; -- Unknown column 'ascii' in 'field list'
+SELECT ascii FROM t1; -- Unknown column 'ascii' in 'SELECT'
 --------
 SELECT replace FROM t1; -- ..syntax.. near 'FROM t1' at line 1
 --------
-SELECT weight_string FROM t1; -- Unknown column 'weight_string' in 'field
+SELECT weight_string FROM t1; -- Unknown column 'weight_string' in 'SELEC
 --------
 SELECT char FROM t1; -- ..syntax.. near 'FROM t1' at line 1
 --------
-SELECT trim FROM t1; -- Unknown column 'trim' in 'field list'
+SELECT trim FROM t1; -- Unknown column 'trim' in 'SELECT'
 --------
-SELECT year FROM t1; -- Unknown column 'year' in 'field list'
+SELECT year FROM t1; -- Unknown column 'year' in 'SELECT'
 --------
 SELECT create FROM t1; -- ..syntax.. near 'create FROM t1' at line
 CALL p2('SELECT t1.$(VAR) FROM t1');
 --------
-SELECT t1.non_keyword FROM t1; -- Unknown column 't1.non_keyword' in 'fiel
+SELECT t1.non_keyword FROM t1; -- Unknown column 't1.non_keyword' in 'SELE
 --------
-SELECT t1.lpad FROM t1; -- Unknown column 't1.lpad' in 'field list'
+SELECT t1.lpad FROM t1; -- Unknown column 't1.lpad' in 'SELECT'
 --------
-SELECT t1.rpad FROM t1; -- Unknown column 't1.rpad' in 'field list'
+SELECT t1.rpad FROM t1; -- Unknown column 't1.rpad' in 'SELECT'
 --------
-SELECT t1.adddate FROM t1; -- Unknown column 't1.adddate' in 'field li
+SELECT t1.adddate FROM t1; -- Unknown column 't1.adddate' in 'SELECT'
 --------
-SELECT t1.substr FROM t1; -- Unknown column 't1.substr' in 'field lis
+SELECT t1.substr FROM t1; -- Unknown column 't1.substr' in 'SELECT'
 --------
-SELECT t1.substring FROM t1; -- Unknown column 't1.substring' in 'field 
+SELECT t1.substring FROM t1; -- Unknown column 't1.substring' in 'SELECT
 --------
-SELECT t1.trim_oracle FROM t1; -- Unknown column 't1.trim_oracle' in 'fiel
+SELECT t1.trim_oracle FROM t1; -- Unknown column 't1.trim_oracle' in 'SELE
 --------
-SELECT t1.ascii FROM t1; -- Unknown column 't1.ascii' in 'field list
+SELECT t1.ascii FROM t1; -- Unknown column 't1.ascii' in 'SELECT'
 --------
-SELECT t1.replace FROM t1; -- Unknown column 't1.replace' in 'field li
+SELECT t1.replace FROM t1; -- Unknown column 't1.replace' in 'SELECT'
 --------
-SELECT t1.weight_string FROM t1; -- Unknown column 't1.weight_string' in 'fi
+SELECT t1.weight_string FROM t1; -- Unknown column 't1.weight_string' in 'SE
 --------
-SELECT t1.char FROM t1; -- Unknown column 't1.char' in 'field list'
+SELECT t1.char FROM t1; -- Unknown column 't1.char' in 'SELECT'
 --------
-SELECT t1.trim FROM t1; -- Unknown column 't1.trim' in 'field list'
+SELECT t1.trim FROM t1; -- Unknown column 't1.trim' in 'SELECT'
 --------
-SELECT t1.year FROM t1; -- Unknown column 't1.year' in 'field list'
+SELECT t1.year FROM t1; -- Unknown column 't1.year' in 'SELECT'
 --------
-SELECT t1.create FROM t1; -- Unknown column 't1.create' in 'field lis
+SELECT t1.create FROM t1; -- Unknown column 't1.create' in 'SELECT'
 CALL p2('DROP TABLE $(VAR)');
 --------
 DROP TABLE non_keyword; -- Unknown table 'test.non_keyword'
diff --git a/mysql-test/main/kill.result b/mysql-test/main/kill.result
index 797052710e8..0f14698ef3d 100644
--- a/mysql-test/main/kill.result
+++ b/mysql-test/main/kill.result
@@ -184,4 +184,4 @@ DROP TABLE t1, t2;
 # KILL QUERY ID USER
 #
 kill query id user 'foo';
-ERROR 42S22: Unknown column 'user' in 'field list'
+ERROR 42S22: Unknown column 'user' in 'KILL'
diff --git a/mysql-test/main/locale.result b/mysql-test/main/locale.result
index 3e632aaead5..22987f1ddc8 100644
--- a/mysql-test/main/locale.result
+++ b/mysql-test/main/locale.result
@@ -311,7 +311,7 @@ date_format('2001-09-01', '%c %b %M', 'de_CH')
 #
 SET lc_messages=ZH_CN;
 SELECT x;
-ERROR 42S22: 未知列'x'在'field list'
+ERROR 42S22: 未知列'x'在'SELECT'
 SET lc_messages=DEFAULT;
 #
 # End of 10.4 tests
diff --git a/mysql-test/main/long_unique.result b/mysql-test/main/long_unique.result
index 7f8110a283e..81af999f07f 100644
--- a/mysql-test/main/long_unique.result
+++ b/mysql-test/main/long_unique.result
@@ -81,7 +81,7 @@ NULL
 maria
 sachin
 select db_row_hash_1 from t1;
-ERROR 42S22: Unknown column 'db_row_hash_1' in 'field list'
+ERROR 42S22: Unknown column 'db_row_hash_1' in 'SELECT'
 #duplicate entry test;
 insert into t1 values(2);
 ERROR 23000: Duplicate entry '2' for key 'a'
@@ -154,7 +154,7 @@ ERROR 23000: Duplicate entry '1' for key 'a'
 insert into t1 values(2,2);
 ERROR 23000: Duplicate entry '2' for key 'a'
 select db_row_hash_1 from t1;
-ERROR 42S22: Unknown column 'db_row_hash_1' in 'field list'
+ERROR 42S22: Unknown column 'db_row_hash_1' in 'SELECT'
 #now try to change db_row_hash_1 column;
 alter table t1 drop column db_row_hash_1;
 ERROR 42000: Can't DROP COLUMN `db_row_hash_1`; check that it exists
@@ -405,11 +405,11 @@ a	b	c	d	e
 maria	345	frter	dasd	utyuty
 sachin	341	fdf	gfgfgfg	hghgr
 select db_row_hash_1 from t1;
-ERROR 42S22: Unknown column 'db_row_hash_1' in 'field list'
+ERROR 42S22: Unknown column 'db_row_hash_1' in 'SELECT'
 select db_row_hash_2 from t1;
-ERROR 42S22: Unknown column 'db_row_hash_2' in 'field list'
+ERROR 42S22: Unknown column 'db_row_hash_2' in 'SELECT'
 select db_row_hash_3 from t1;
-ERROR 42S22: Unknown column 'db_row_hash_3' in 'field list'
+ERROR 42S22: Unknown column 'db_row_hash_3' in 'SELECT'
 #duplicate entry test;
 insert into t1 values(21,2,3,42,51);
 ERROR 23000: Duplicate entry '3' for key 'c'
@@ -462,7 +462,7 @@ t1	CREATE TABLE `t1` (
 insert into t1 values(1,2,3,4,5,6);
 ERROR 23000: Duplicate entry '1' for key 'a'
 select db_row_hash_1 , db_row_hash_2, db_row_hash_3 from t1;
-ERROR 42S22: Unknown column 'db_row_hash_1' in 'field list'
+ERROR 42S22: Unknown column 'db_row_hash_1' in 'SELECT'
 #now try to change db_row_hash_1 column;
 alter table t1 drop column db_row_hash_1, drop column db_row_hash_2, drop column db_row_hash_3;
 ERROR 42000: Can't DROP COLUMN `db_row_hash_1`; check that it exists
@@ -786,11 +786,11 @@ NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
 maria	6	maria	maria	maria	maria	6	maria
 mariadb	7	mariadb	mariadb	mariadb	mariadb	8	mariadb
 select db_row_hash_1 from t1;
-ERROR 42S22: Unknown column 'db_row_hash_1' in 'field list'
+ERROR 42S22: Unknown column 'db_row_hash_1' in 'SELECT'
 select db_row_hash_2 from t1;
-ERROR 42S22: Unknown column 'db_row_hash_2' in 'field list'
+ERROR 42S22: Unknown column 'db_row_hash_2' in 'SELECT'
 select db_row_hash_3 from t1;
-ERROR 42S22: Unknown column 'db_row_hash_3' in 'field list'
+ERROR 42S22: Unknown column 'db_row_hash_3' in 'SELECT'
 #duplicate entry test;
 #duplicate keys entry;
 insert into t1 values(1,1,1,0,0,0,0,0);
@@ -806,7 +806,7 @@ ERROR 23000: Duplicate entry '1-1-1-1' for key 'e'
 insert into t1 values(1,1,1,1,1,1,1,1);
 ERROR 23000: Duplicate entry '1-1-1' for key 'a'
 select db_row_hash_1,db_row_hash_2,db_row_hash_3,db_row_hash_4,db_row_hash_5 from t1;
-ERROR 42S22: Unknown column 'db_row_hash_1' in 'field list'
+ERROR 42S22: Unknown column 'db_row_hash_1' in 'SELECT'
 alter table t1 drop column db_row_hash_1, drop column db_row_hash_2, drop column db_row_hash_3;
 ERROR 42000: Can't DROP COLUMN `db_row_hash_1`; check that it exists
 alter table t1 add column dg int , add column ef int , drop column db_row_hash_1;
@@ -1170,7 +1170,7 @@ DB_ROW_HASH_1	DB_ROW_HASH_2
 33	3
 44	4
 select DB_ROW_HASH_1, DB_ROW_HASH_2 from t1;
-ERROR 42S22: Unknown column 'DB_ROW_HASH_1' in 'field list'
+ERROR 42S22: Unknown column 'DB_ROW_HASH_1' in 'SELECT'
 #bug
 select DB_ROW_HASH_1, DB_ROW_HASH_2 from t1,t2;
 DB_ROW_HASH_1	DB_ROW_HASH_2
@@ -1191,7 +1191,7 @@ DB_ROW_HASH_1	DB_ROW_HASH_2
 44	4
 44	4
 select * from t1 where DB_ROW_HASH_1 in (select DB_ROW_HASH_1 from t2);
-ERROR 42S22: Unknown column 'DB_ROW_HASH_1' in 'IN/ALL/ANY subquery'
+ERROR 42S22: Unknown column 'DB_ROW_HASH_1' in 'IN/ALL/ANY'
 select DB_ROW_HASH_1, DB_ROW_HASH_2 from t1,t2 where DB_ROW_HASH_1 in (select DB_ROW_HASH_1 from t2);
 DB_ROW_HASH_1	DB_ROW_HASH_2
 11	1
@@ -1217,7 +1217,7 @@ DB_ROW_HASH_1	DB_ROW_HASH_2
 33	3
 44	4
 select DB_ROW_HASH_1 from t1,t2 where t1.DB_ROW_HASH_1 = t2.DB_ROW_HASH_2;
-ERROR 42S22: Unknown column 't1.DB_ROW_HASH_1' in 'where clause'
+ERROR 42S22: Unknown column 't1.DB_ROW_HASH_1' in 'WHERE'
 select DB_ROW_HASH_1 from t1 inner join t2 on t1.a = t2.DB_ROW_HASH_2;
 DB_ROW_HASH_1
 11
diff --git a/mysql-test/main/mdev6830.result b/mysql-test/main/mdev6830.result
index 0048aa174bc..e0e181334e0 100644
--- a/mysql-test/main/mdev6830.result
+++ b/mysql-test/main/mdev6830.result
@@ -42,7 +42,7 @@ CREATE TABLE t4 (f1 VARCHAR(10), f2 INT) ENGINE=MyISAM;
 SELECT * FROM t1;
 pk
 SELECT non_existing FROM v2;
-ERROR 42S22: Unknown column 'non_existing' in 'field list'
+ERROR 42S22: Unknown column 'non_existing' in 'SELECT'
 SELECT * FROM t1, v3, t4 WHERE v3.f1 = t4.f1 AND t4.f2 = 6 AND t1.pk = v3.f5;
 pk	f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12	f13	f14	f15	f1	f2
 drop table t1,t2,t3,t4;
diff --git a/mysql-test/main/multi_update.result b/mysql-test/main/multi_update.result
index 222c592cbce..b13cc8b73ca 100644
--- a/mysql-test/main/multi_update.result
+++ b/mysql-test/main/multi_update.result
@@ -993,19 +993,19 @@ create view v2 as select * from t2;
 create view v3 as select * from t2 where c0 < 3;
 create  procedure sp0() update t1, v2 set v2.pk = 1 where v2.c0 = t1.c1;
 call sp0();
-ERROR 42S22: Unknown column 't1.c1' in 'where clause'
+ERROR 42S22: Unknown column 't1.c1' in 'WHERE'
 call sp0();
-ERROR 42S22: Unknown column 't1.c1' in 'where clause'
+ERROR 42S22: Unknown column 't1.c1' in 'WHERE'
 create  procedure sp1() update (t1 join v2 on v2.c0 = t1.c1) set v2.pk = 1;
 call sp1();
-ERROR 42S22: Unknown column 't1.c1' in 'on clause'
+ERROR 42S22: Unknown column 't1.c1' in 'ON'
 call sp1();
-ERROR 42S22: Unknown column 't1.c1' in 'on clause'
+ERROR 42S22: Unknown column 't1.c1' in 'ON'
 create  procedure sp2() update (t1 join v3 on v3.c0 = t1.c1) set v3.pk = 1;
 call sp2();
-ERROR 42S22: Unknown column 't1.c1' in 'on clause'
+ERROR 42S22: Unknown column 't1.c1' in 'ON'
 call sp2();
-ERROR 42S22: Unknown column 't1.c1' in 'on clause'
+ERROR 42S22: Unknown column 't1.c1' in 'ON'
 create  procedure sp3()
 update (t1 join v2 on v2.c0 = t1.id) set v2.c0 = v2.c0+1;
 select * from t2;
@@ -1024,9 +1024,9 @@ pk	c0
 2	3
 create  procedure sp4() delete t1 from t1 join v2 on v2.c0 = t1.c1;
 call sp4();
-ERROR 42S22: Unknown column 't1.c1' in 'on clause'
+ERROR 42S22: Unknown column 't1.c1' in 'ON'
 call sp4();
-ERROR 42S22: Unknown column 't1.c1' in 'on clause'
+ERROR 42S22: Unknown column 't1.c1' in 'ON'
 drop procedure sp0;
 drop procedure sp1;
 drop procedure sp2;
diff --git a/mysql-test/main/myisam_explain_non_select_all.result b/mysql-test/main/myisam_explain_non_select_all.result
index e28c2a0fec3..193c58a9787 100644
--- a/mysql-test/main/myisam_explain_non_select_all.result
+++ b/mysql-test/main/myisam_explain_non_select_all.result
@@ -2927,16 +2927,16 @@ DROP TABLE t1;
 CREATE TABLE t1 (a INT);
 INSERT INTO t1 VALUES (1), (2), (3);
 DELETE FROM t1 USING t1 WHERE uknown_column = 12345;
-ERROR 42S22: Unknown column 'uknown_column' in 'where clause'
+ERROR 42S22: Unknown column 'uknown_column' in 'WHERE'
 EXPLAIN EXTENDED DELETE FROM t1 USING t1 WHERE uknown_column = 12345;
-ERROR 42S22: Unknown column 'uknown_column' in 'where clause'
+ERROR 42S22: Unknown column 'uknown_column' in 'WHERE'
 DROP TABLE t1;
 #57
 CREATE TABLE t1(f1 INT);
 EXPLAIN EXTENDED UPDATE t1 SET f2=1 ORDER BY f2;
-ERROR 42S22: Unknown column 'f2' in 'order clause'
+ERROR 42S22: Unknown column 'f2' in 'ORDER BY'
 UPDATE t1 SET f2=1 ORDER BY f2;
-ERROR 42S22: Unknown column 'f2' in 'order clause'
+ERROR 42S22: Unknown column 'f2' in 'ORDER BY'
 DROP TABLE t1;
 #62
 CREATE TABLE t1 (a INT);
diff --git a/mysql-test/main/mysqldump.result b/mysql-test/main/mysqldump.result
index 8850e9564e0..2735c196166 100644
--- a/mysql-test/main/mysqldump.result
+++ b/mysql-test/main/mysqldump.result
@@ -67,7 +67,7 @@ SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='ANSI_QUOTES';
 INSERT INTO t1 VALUES (1.2345, 2.3456);
 INSERT INTO t1 VALUES ('1.2345', 2.3456);
 INSERT INTO t1 VALUES ("1.2345", 2.3456);
-ERROR 42S22: Unknown column '1.2345' in 'field list'
+ERROR 42S22: Unknown column '1.2345' in 'VALUES'
 SET SQL_MODE=@OLD_SQL_MODE;
 /*M!999999\- enable the sandbox mode */ 
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
diff --git a/mysql-test/main/mysqldump_restore.result b/mysql-test/main/mysqldump_restore.result
index cc4a5cd5965..315da72ddf9 100644
--- a/mysql-test/main/mysqldump_restore.result
+++ b/mysql-test/main/mysqldump_restore.result
@@ -34,7 +34,7 @@ SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='ANSI_QUOTES';
 INSERT INTO t1 VALUES (1.2345, 2.3456);
 INSERT INTO t1 VALUES ('1.2345', 2.3456);
 INSERT INTO t1 VALUES ("1.2345", 2.3456);
-ERROR 42S22: Unknown column '1.2345' in 'field list'
+ERROR 42S22: Unknown column '1.2345' in 'VALUES'
 SET SQL_MODE=@OLD_SQL_MODE;
 # Begin testing mysqldump output + restore
 # Create 'original table name - <table>_orig
diff --git a/mysql-test/main/mysqltest.result b/mysql-test/main/mysqltest.result
index 73f2c8851f9..478ef82ca1f 100644
--- a/mysql-test/main/mysqltest.result
+++ b/mysql-test/main/mysqltest.result
@@ -8,9 +8,9 @@ select otto from (select 1 as otto) as t1;
 otto
 1
 select friedrich from (select 1 as otto) as t1;
-mysqltest: At line 1: query 'select friedrich from (select 1 as otto) as t1' failed: ER_BAD_FIELD_ERROR (1054): Unknown column 'friedrich' in 'field list'
+mysqltest: At line 1: query 'select friedrich from (select 1 as otto) as t1' failed: ER_BAD_FIELD_ERROR (1054): Unknown column 'friedrich' in 'SELECT'
 select friedrich from (select 1 as otto) as t1;
-ERROR 42S22: Unknown column 'friedrich' in 'field list'
+ERROR 42S22: Unknown column 'friedrich' in 'SELECT'
 select otto from (select 1 as otto) as t1;
 otto
 1
@@ -18,9 +18,9 @@ select otto from (select 1 as otto) as t1;
 mysqltest: At line 1: query 'select otto from (select 1 as otto) as t1' succeeded - should have failed with sqlstate 42S22...
 mysqltest: At line 1: expecting a SQL-state (00000) from query 'remove_file MYSQLTEST_VARDIR/tmp/test_nonexistent.tmp' which cannot produce one...
 select friedrich from (select 1 as otto) as t1;
-ERROR 42S22: Unknown column 'friedrich' in 'field list'
+ERROR 42S22: Unknown column 'friedrich' in 'SELECT'
 select friedrich from (select 1 as otto) as t1;
-mysqltest: At line 1: query 'select friedrich from (select 1 as otto) as t1' failed with wrong sqlstate 42S22: 'Unknown column 'friedrich' in 'field list'', instead of 00000...
+mysqltest: At line 1: query 'select friedrich from (select 1 as otto) as t1' failed with wrong sqlstate 42S22: 'Unknown column 'friedrich' in 'SELECT'', instead of 00000...
 select otto from (select 1 as otto) as t1;
 otto
 1
diff --git a/mysql-test/main/mysqltest_cont_on_error.result b/mysql-test/main/mysqltest_cont_on_error.result
index 352799deb06..32c6bfce4b9 100644
--- a/mysql-test/main/mysqltest_cont_on_error.result
+++ b/mysql-test/main/mysqltest_cont_on_error.result
@@ -1,7 +1,7 @@
 select error;
-mysqltest: At line 1: query 'select error' failed: ER_BAD_FIELD_ERROR (1054): Unknown column 'error' in 'field list'
+mysqltest: At line 1: query 'select error' failed: ER_BAD_FIELD_ERROR (1054): Unknown column 'error' in 'SELECT'
 SELECT ERROR;
-mysqltest: At line 1: query 'SELECT ERROR' failed: ER_BAD_FIELD_ERROR (1054): Unknown column 'ERROR' in 'field list'
+mysqltest: At line 1: query 'SELECT ERROR' failed: ER_BAD_FIELD_ERROR (1054): Unknown column 'ERROR' in 'SELECT'
 SELECT 2;
 2
 2
diff --git a/mysql-test/main/mysqltest_ps.result b/mysql-test/main/mysqltest_ps.result
index 153098ff088..d6266964e3d 100644
--- a/mysql-test/main/mysqltest_ps.result
+++ b/mysql-test/main/mysqltest_ps.result
@@ -7,7 +7,7 @@ create table t (a int primary key, b blob default '');
 select a, (2*a) AS a from t group by a;
 a	a
 Warnings:
-Warning	1052	Column 'a' in group statement is ambiguous
+Warning	1052	Column 'a' in GROUP BY is ambiguous
 drop table t;
 select 1 + "2 a";
 1 + "2 a"
@@ -18,8 +18,8 @@ create table t (a int primary key, b blob default '');
 select a, (2*a) AS a from t group by a;
 a	a
 Warnings:
-Warning	1052	Column 'a' in group statement is ambiguous
-Warning	1052	Column 'a' in group statement is ambiguous
+Warning	1052	Column 'a' in GROUP BY is ambiguous
+Warning	1052	Column 'a' in GROUP BY is ambiguous
 drop table t;
 select 1 + "2 a";
 1 + "2 a"
@@ -30,5 +30,5 @@ create table t (a int primary key, b blob default '');
 select a, (2*a) AS a from t group by a;
 a	a
 Warnings:
-Warning	1052	Column 'a' in group statement is ambiguous
+Warning	1052	Column 'a' in GROUP BY is ambiguous
 drop table t;
diff --git a/mysql-test/main/named_pipe.result b/mysql-test/main/named_pipe.result
index 2baa3471ec9..06315d21a9d 100644
--- a/mysql-test/main/named_pipe.result
+++ b/mysql-test/main/named_pipe.result
@@ -2156,7 +2156,7 @@ SELECT ELT(FIELD(kundentyp,'PP','PPA','PG','PGA','FK','FKA','FP','FPA','K','KA',
 Kundentyp	kategorie
 Privat (Private Nutzung)	Mobilfunk
 Warnings:
-Warning	1052	Column 'kundentyp' in group statement is ambiguous
+Warning	1052	Column 'kundentyp' in GROUP BY is ambiguous
 drop table t1;
 connection default;
 disconnect pipe_con;
diff --git a/mysql-test/main/order_by.result b/mysql-test/main/order_by.result
index 0d80f2325b6..3f52f276001 100644
--- a/mysql-test/main/order_by.result
+++ b/mysql-test/main/order_by.result
@@ -796,18 +796,18 @@ col1	col	t2_col
 2	2	2
 3	3	1
 select col1 as col, col from t1 order by col;
-ERROR 23000: Column 'col' in order clause is ambiguous
+ERROR 23000: Column 'col' in ORDER BY is ambiguous
 select t1.col as c1, t2.col as c2 from t1, t2 where t1.col1=t2.col2
 order by col;
-ERROR 23000: Column 'col' in order clause is ambiguous
+ERROR 23000: Column 'col' in ORDER BY is ambiguous
 select t1.col as c1, t2.col as c2 from t1, t2 where t1.col1=t2.col2
 order by col;
-ERROR 23000: Column 'col' in order clause is ambiguous
+ERROR 23000: Column 'col' in ORDER BY is ambiguous
 select col1 from t1, t2 where t1.col1=t2.col2 order by col;
-ERROR 23000: Column 'col' in order clause is ambiguous
+ERROR 23000: Column 'col' in ORDER BY is ambiguous
 select t1.col as t1_col, t2.col2 from t1, t2 where t1.col1=t2.col2
 order by col;
-ERROR 23000: Column 'col' in order clause is ambiguous
+ERROR 23000: Column 'col' in ORDER BY is ambiguous
 select t1.col as t1_col, t2.col from t1, t2 where t1.col1=t2.col2
 order by col;
 t1_col	col
@@ -958,45 +958,45 @@ num
 2
 3
 SELECT a + 1 AS num, num + 1 FROM t1;
-ERROR 42S22: Unknown column 'num' in 'field list'
+ERROR 42S22: Unknown column 'num' in 'SELECT'
 SELECT a + 1 AS num, (select num + 2 FROM t1 LIMIT 1) FROM t1;
 num	(select num + 2 FROM t1 LIMIT 1)
 2	4
 3	5
 SELECT a.a + 1 AS num FROM t1 a JOIN t1 b ON num = b.a;
-ERROR 42S22: Unknown column 'num' in 'on clause'
+ERROR 42S22: Unknown column 'num' in 'ON'
 DROP TABLE t1;
 CREATE TABLE bug25126 (
 val int unsigned NOT NULL AUTO_INCREMENT PRIMARY KEY
 );
 UPDATE bug25126 SET MissingCol = MissingCol;
-ERROR 42S22: Unknown column 'MissingCol' in 'field list'
+ERROR 42S22: Unknown column 'MissingCol' in 'SET'
 UPDATE bug25126 SET val = val ORDER BY MissingCol;
-ERROR 42S22: Unknown column 'MissingCol' in 'order clause'
+ERROR 42S22: Unknown column 'MissingCol' in 'ORDER BY'
 UPDATE bug25126 SET val = val ORDER BY val;
 UPDATE bug25126 SET val = 1 ORDER BY val;
 UPDATE bug25126 SET val = 1 ORDER BY MissingCol;
-ERROR 42S22: Unknown column 'MissingCol' in 'order clause'
+ERROR 42S22: Unknown column 'MissingCol' in 'ORDER BY'
 UPDATE bug25126 SET val = 1 ORDER BY val, MissingCol;
-ERROR 42S22: Unknown column 'MissingCol' in 'order clause'
+ERROR 42S22: Unknown column 'MissingCol' in 'ORDER BY'
 UPDATE bug25126 SET val = MissingCol ORDER BY MissingCol;
-ERROR 42S22: Unknown column 'MissingCol' in 'order clause'
+ERROR 42S22: Unknown column 'MissingCol' in 'ORDER BY'
 UPDATE bug25126 SET MissingCol = 1 ORDER BY val, MissingCol;
-ERROR 42S22: Unknown column 'MissingCol' in 'order clause'
+ERROR 42S22: Unknown column 'MissingCol' in 'ORDER BY'
 UPDATE bug25126 SET MissingCol = 1 ORDER BY MissingCol;
-ERROR 42S22: Unknown column 'MissingCol' in 'order clause'
+ERROR 42S22: Unknown column 'MissingCol' in 'ORDER BY'
 UPDATE bug25126 SET MissingCol = val ORDER BY MissingCol;
-ERROR 42S22: Unknown column 'MissingCol' in 'order clause'
+ERROR 42S22: Unknown column 'MissingCol' in 'ORDER BY'
 UPDATE bug25126 SET MissingCol = MissingCol ORDER BY MissingCol;
-ERROR 42S22: Unknown column 'MissingCol' in 'order clause'
+ERROR 42S22: Unknown column 'MissingCol' in 'ORDER BY'
 DROP TABLE bug25126;
 CREATE TABLE t1 (a int);
 SELECT p.a AS val, q.a AS val1 FROM t1 p, t1 q ORDER BY val > 1;
 val	val1
 SELECT p.a AS val, q.a AS val FROM t1 p, t1 q ORDER BY val;
-ERROR 23000: Column 'val' in order clause is ambiguous
+ERROR 23000: Column 'val' in ORDER BY is ambiguous
 SELECT p.a AS val, q.a AS val FROM t1 p, t1 q ORDER BY val > 1;
-ERROR 23000: Column 'val' in order clause is ambiguous
+ERROR 23000: Column 'val' in ORDER BY is ambiguous
 DROP TABLE t1;
 CREATE TABLE t1 (a int);
 INSERT INTO t1 VALUES (3), (2), (4), (1);
diff --git a/mysql-test/main/parser.result b/mysql-test/main/parser.result
index 1cdf89a2739..b52af23eb49 100644
--- a/mysql-test/main/parser.result
+++ b/mysql-test/main/parser.result
@@ -2231,11 +2231,11 @@ drop table t1;
 # MDEV-19682 sql_mode="oracle" does not support sysdate
 #
 SELECT sysdate LIKE '____-__-__ __:__:__';
-ERROR 42S22: Unknown column 'sysdate' in 'field list'
+ERROR 42S22: Unknown column 'sysdate' in 'SELECT'
 SELECT sysdate = sysdate();
-ERROR 42S22: Unknown column 'sysdate' in 'field list'
+ERROR 42S22: Unknown column 'sysdate' in 'SELECT'
 SELECT sysdate = sysdate(0);
-ERROR 42S22: Unknown column 'sysdate' in 'field list'
+ERROR 42S22: Unknown column 'sysdate' in 'SELECT'
 CREATE DATABASE sysdate;
 DROP DATABASE sysdate;
 CREATE TABLE sysdate (a INT);
diff --git a/mysql-test/main/partition.result b/mysql-test/main/partition.result
index 687c287bd34..a9a19cf7748 100644
--- a/mysql-test/main/partition.result
+++ b/mysql-test/main/partition.result
@@ -2018,7 +2018,7 @@ PARTITION BY RANGE (t2.b) (
 PARTITION p1 VALUES LESS THAN (10),
 PARTITION p2 VALUES LESS THAN (20)
 ) select * from t2;
-ERROR 42S22: Unknown column 't2.b' in 'partition function'
+ERROR 42S22: Unknown column 't2.b' in 'PARTITION BY'
 create table t1 (a int)
 PARTITION BY RANGE (b) (
 PARTITION p1 VALUES LESS THAN (10),
diff --git a/mysql-test/main/partition_column.result b/mysql-test/main/partition_column.result
index c3a2ce872ce..c3fcd05443e 100644
--- a/mysql-test/main/partition_column.result
+++ b/mysql-test/main/partition_column.result
@@ -572,7 +572,7 @@ create table t1 (a char(6))
 partition by range columns(a)
 (partition p0 values less than (H23456),
 partition p1 values less than (M23456));
-ERROR 42S22: Unknown column 'H23456' in 'field list'
+ERROR 42S22: Unknown column 'H23456' in 'PARTITION BY'
 create table t1 (a char(6))
 partition by range columns(a)
 (partition p0 values less than (23456),
diff --git a/mysql-test/main/partition_error.result b/mysql-test/main/partition_error.result
index 350e8733220..ae41c28d8f8 100644
--- a/mysql-test/main/partition_error.result
+++ b/mysql-test/main/partition_error.result
@@ -934,7 +934,7 @@ partitions 3
 (partition x1 tablespace ts1,
 partition x2 tablespace ts2,
 partition x3 tablespace ts3);
-ERROR 42S22: Unknown column 'd' in 'partition function'
+ERROR 42S22: Unknown column 'd' in 'PARTITION BY'
 CREATE TABLE t1 (
 a int not null,
 b int not null,
@@ -1156,7 +1156,7 @@ partition by range (a)
 subpartition by hash (a+d)
 (partition x1 values less than (1) (subpartition x11, subpartition x12),
 partition x2 values less than (2) (subpartition x21, subpartition x22));
-ERROR 42S22: Unknown column 'd' in 'partition function'
+ERROR 42S22: Unknown column 'd' in 'PARTITION BY'
 CREATE TABLE t1 (
 a int not null,
 b int not null,
@@ -1176,7 +1176,7 @@ partition by range (a+d)
 partitions 2
 (partition x1 values less than (4) tablespace ts1,
 partition x2 values less than (8) tablespace ts2);
-ERROR 42S22: Unknown column 'd' in 'partition function'
+ERROR 42S22: Unknown column 'd' in 'PARTITION BY'
 CREATE TABLE t1 (
 a int not null,
 b int not null,
@@ -1375,7 +1375,7 @@ partition by list (a+d)
 partitions 2
 (partition x1 values in (4) tablespace ts1,
 partition x2 values in (8) tablespace ts2);
-ERROR 42S22: Unknown column 'd' in 'partition function'
+ERROR 42S22: Unknown column 'd' in 'PARTITION BY'
 CREATE TABLE t1 (
 a int not null,
 b int not null,
@@ -1440,7 +1440,7 @@ partition x2 values in (5))' at line 8
 CREATE TABLE t1 (a int)
 PARTITION BY RANGE (a)
 (PARTITION p0 VALUES LESS THAN (x1));
-ERROR 42S22: Unknown column 'x1' in 'partition function'
+ERROR 42S22: Unknown column 'x1' in 'PARTITION BY'
 CREATE TABLE t1(a int)
 PARTITION BY RANGE (a) (PARTITION p1 VALUES LESS THAN(5));
 insert into t1 values (10);
diff --git a/mysql-test/main/partition_mgm_err.result b/mysql-test/main/partition_mgm_err.result
index 2d523998985..6e8914fd13d 100644
--- a/mysql-test/main/partition_mgm_err.result
+++ b/mysql-test/main/partition_mgm_err.result
@@ -166,6 +166,6 @@ alter table t1 check partition all for upgrade;
 Table	Op	Msg_type	Msg_text
 test.t1	check	status	OK
 alter table t1 order by nonexistent;
-ERROR 42S22: Unknown column 'nonexistent' in 'order clause'
+ERROR 42S22: Unknown column 'nonexistent' in 'ORDER BY'
 drop table t1;
 # End of 10.5 tests
diff --git a/mysql-test/main/pool_of_threads.result b/mysql-test/main/pool_of_threads.result
index 91ad7ab098f..ba74e74cb37 100644
--- a/mysql-test/main/pool_of_threads.result
+++ b/mysql-test/main/pool_of_threads.result
@@ -2156,7 +2156,7 @@ SELECT ELT(FIELD(kundentyp,'PP','PPA','PG','PGA','FK','FKA','FP','FPA','K','KA',
 Kundentyp	kategorie
 Privat (Private Nutzung)	Mobilfunk
 Warnings:
-Warning	1052	Column 'kundentyp' in group statement is ambiguous
+Warning	1052	Column 'kundentyp' in GROUP BY is ambiguous
 drop table t1;
 SET optimizer_switch=default;
 connection default;
diff --git a/mysql-test/main/ps.result b/mysql-test/main/ps.result
index 9f99d613539..775ada34653 100644
--- a/mysql-test/main/ps.result
+++ b/mysql-test/main/ps.result
@@ -1737,15 +1737,15 @@ create table t1 (id int primary key auto_increment, value varchar(10));
 insert into t1 (id, value) values (1, 'FIRST'), (2, 'SECOND'), (3, 'THIRD');
 prepare stmt from "insert into t1 (id, value) select * from (select 4 as i, 'FOURTH' as v) as y on duplicate key update v = 'DUP'";
 execute stmt;
-ERROR 42S22: Unknown column 'v' in 'field list'
+ERROR 42S22: Unknown column 'v' in 'UPDATE'
 execute stmt;
-ERROR 42S22: Unknown column 'v' in 'field list'
+ERROR 42S22: Unknown column 'v' in 'UPDATE'
 deallocate prepare stmt;
 prepare stmt from "insert into t1 (id, value) select * from (select 4 as id, 'FOURTH' as value) as y on duplicate key update y.value = 'DUP'";
 execute stmt;
-ERROR 42S22: Unknown column 'y.value' in 'field list'
+ERROR 42S22: Unknown column 'y.value' in 'UPDATE'
 execute stmt;
-ERROR 42S22: Unknown column 'y.value' in 'field list'
+ERROR 42S22: Unknown column 'y.value' in 'UPDATE'
 deallocate prepare stmt;
 drop tables t1;
 prepare stmt from "create table t1 select ?";
@@ -4933,9 +4933,9 @@ ERROR 42000: EXECUTE IMMEDIATE does not support subqueries or stored functions
 PREPARE stmt FROM (SELECT 'SELECT 1');
 ERROR 42000: PREPARE..FROM does not support subqueries or stored functions
 EXECUTE IMMEDIATE a;
-ERROR 42S22: Unknown column 'a' in 'field list'
+ERROR 42S22: Unknown column 'a' in 'EXECUTE IMMEDIATE'
 PREPARE stmt FROM a;
-ERROR 42S22: Unknown column 'a' in 'field list'
+ERROR 42S22: Unknown column 'a' in 'PREPARE..FROM'
 EXECUTE IMMEDIATE NULL;
 ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'NULL' at line 1
 PREPARE stmt FROM NULL;
@@ -4955,9 +4955,9 @@ ERROR 21000: Operand should contain 1 column(s)
 EXECUTE IMMEDIATE MAX('SELECT 1 AS c');
 ERROR HY000: Invalid use of group function
 EXECUTE IMMEDIATE DEFAULT(a);
-ERROR 42S22: Unknown column 'a' in 'field list'
+ERROR 42S22: Unknown column 'a' in 'EXECUTE IMMEDIATE'
 EXECUTE IMMEDIATE VALUE(a);
-ERROR 42S22: Unknown column 'a' in 'field list'
+ERROR 42S22: Unknown column 'a' in 'EXECUTE IMMEDIATE'
 CREATE FUNCTION f1() RETURNS VARCHAR(64) RETURN 't1';
 EXECUTE IMMEDIATE f1();
 ERROR 42000: EXECUTE IMMEDIATE does not support subqueries or stored functions
diff --git a/mysql-test/main/ps_1general.result b/mysql-test/main/ps_1general.result
index ca2447b6b26..cb53ae68823 100644
--- a/mysql-test/main/ps_1general.result
+++ b/mysql-test/main/ps_1general.result
@@ -91,11 +91,11 @@ prepare stmt1 from @arg01;
 ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'NULL' at line 1
 prepare stmt1 from ' select * from t1 where a <= 2 ' ;
 prepare stmt1 from ' select * from t1 where x <= 2 ' ;
-ERROR 42S22: Unknown column 'x' in 'where clause'
+ERROR 42S22: Unknown column 'x' in 'WHERE'
 prepare stmt1 from ' insert into t1(a,x) values(?,?) ' ;
-ERROR 42S22: Unknown column 'x' in 'field list'
+ERROR 42S22: Unknown column 'x' in 'INSERT INTO'
 prepare stmt1 from ' insert into t1(x,a) values(?,?) ' ;
-ERROR 42S22: Unknown column 'x' in 'field list'
+ERROR 42S22: Unknown column 'x' in 'INSERT INTO'
 drop table if exists not_exist ;
 prepare stmt1 from ' select * from not_exist where a <= 2 ' ;
 ERROR 42S02: Table 'test.not_exist' doesn't exist
diff --git a/mysql-test/main/ps_2myisam.result b/mysql-test/main/ps_2myisam.result
index ec365498833..d6552d81cb9 100644
--- a/mysql-test/main/ps_2myisam.result
+++ b/mysql-test/main/ps_2myisam.result
@@ -440,7 +440,7 @@ a	b
 4	four
 set @arg00=0 ;
 execute stmt1 using @arg00;
-ERROR 42S22: Unknown column '?' in 'order clause'
+ERROR 42S22: Unknown column '?' in 'ORDER BY'
 set @arg00=1;
 prepare stmt1 from ' select a,b from t1 order by a
 limit 1 ';
diff --git a/mysql-test/main/ps_3innodb.result b/mysql-test/main/ps_3innodb.result
index 1c98a59cff5..320d767fecd 100644
--- a/mysql-test/main/ps_3innodb.result
+++ b/mysql-test/main/ps_3innodb.result
@@ -440,7 +440,7 @@ a	b
 4	four
 set @arg00=0 ;
 execute stmt1 using @arg00;
-ERROR 42S22: Unknown column '?' in 'order clause'
+ERROR 42S22: Unknown column '?' in 'ORDER BY'
 set @arg00=1;
 prepare stmt1 from ' select a,b from t1 order by a
 limit 1 ';
diff --git a/mysql-test/main/ps_4heap.result b/mysql-test/main/ps_4heap.result
index db182536e93..6c81e1cb0fd 100644
--- a/mysql-test/main/ps_4heap.result
+++ b/mysql-test/main/ps_4heap.result
@@ -441,7 +441,7 @@ a	b
 4	four
 set @arg00=0 ;
 execute stmt1 using @arg00;
-ERROR 42S22: Unknown column '?' in 'order clause'
+ERROR 42S22: Unknown column '?' in 'ORDER BY'
 set @arg00=1;
 prepare stmt1 from ' select a,b from t1 order by a
 limit 1 ';
diff --git a/mysql-test/main/ps_5merge.result b/mysql-test/main/ps_5merge.result
index 963a3a60359..16c68a3872d 100644
--- a/mysql-test/main/ps_5merge.result
+++ b/mysql-test/main/ps_5merge.result
@@ -484,7 +484,7 @@ a	b
 4	four
 set @arg00=0 ;
 execute stmt1 using @arg00;
-ERROR 42S22: Unknown column '?' in 'order clause'
+ERROR 42S22: Unknown column '?' in 'ORDER BY'
 set @arg00=1;
 prepare stmt1 from ' select a,b from t1 order by a
 limit 1 ';
@@ -3852,7 +3852,7 @@ a	b
 4	four
 set @arg00=0 ;
 execute stmt1 using @arg00;
-ERROR 42S22: Unknown column '?' in 'order clause'
+ERROR 42S22: Unknown column '?' in 'ORDER BY'
 set @arg00=1;
 prepare stmt1 from ' select a,b from t1 order by a
 limit 1 ';
diff --git a/mysql-test/main/ps_ddl1.result b/mysql-test/main/ps_ddl1.result
index 5178ee64f16..16776325934 100644
--- a/mysql-test/main/ps_ddl1.result
+++ b/mysql-test/main/ps_ddl1.result
@@ -165,7 +165,7 @@ call p_verify_reprepare_count(1);
 SUCCESS
 
 execute stmt7;
-ERROR 42S22: Unknown column 'b' in 'field list'
+ERROR 42S22: Unknown column 'b' in 'INSERT INTO'
 call p_verify_reprepare_count(1);
 SUCCESS
 
@@ -185,17 +185,17 @@ call p_verify_reprepare_count(1);
 SUCCESS
 
 execute stmt3;
-ERROR 42S22: Unknown column 'b' in 'where clause'
+ERROR 42S22: Unknown column 'b' in 'WHERE'
 call p_verify_reprepare_count(1);
 SUCCESS
 
 execute stmt2;
-ERROR 42S22: Unknown column 'b' in 'field list'
+ERROR 42S22: Unknown column 'b' in 'SELECT'
 call p_verify_reprepare_count(1);
 SUCCESS
 
 execute stmt1;
-ERROR 42S22: Unknown column 'b' in 'field list'
+ERROR 42S22: Unknown column 'b' in 'SELECT'
 call p_verify_reprepare_count(1);
 SUCCESS
 
@@ -205,7 +205,7 @@ call p_verify_reprepare_count(1);
 ERROR
 Expected: 1, actual: 0
 execute stmt7;
-ERROR 42S22: Unknown column 'b' in 'field list'
+ERROR 42S22: Unknown column 'b' in 'INSERT INTO'
 call p_verify_reprepare_count(1);
 SUCCESS
 
@@ -225,17 +225,17 @@ call p_verify_reprepare_count(1);
 SUCCESS
 
 execute stmt3;
-ERROR 42S22: Unknown column 'b' in 'where clause'
+ERROR 42S22: Unknown column 'b' in 'WHERE'
 call p_verify_reprepare_count(1);
 SUCCESS
 
 execute stmt2;
-ERROR 42S22: Unknown column 'b' in 'field list'
+ERROR 42S22: Unknown column 'b' in 'SELECT'
 call p_verify_reprepare_count(1);
 SUCCESS
 
 execute stmt1;
-ERROR 42S22: Unknown column 'b' in 'field list'
+ERROR 42S22: Unknown column 'b' in 'SELECT'
 call p_verify_reprepare_count(1);
 SUCCESS
 
diff --git a/mysql-test/main/query_cache_with_views.result b/mysql-test/main/query_cache_with_views.result
index 8cb3d8cb297..9cefa0cc6c1 100644
--- a/mysql-test/main/query_cache_with_views.result
+++ b/mysql-test/main/query_cache_with_views.result
@@ -205,7 +205,7 @@ CREATE TABLE t2 LIKE t1;
 SET AUTOCOMMIT=OFF;
 CREATE VIEW t1_view AS SELECT c1 FROM t1 NATURAL JOIN t2 ;
 INSERT INTO t1_view (c1, c2) SELECT c1, c2 FROM t1;
-ERROR 42S22: Unknown column 'c2' in 'field list'
+ERROR 42S22: Unknown column 'c2' in 'INSERT INTO'
 DROP TABLE t1;
 DROP TABLE t2;
 DROP VIEW t1_view;
diff --git a/mysql-test/main/replace_returning.result b/mysql-test/main/replace_returning.result
index 1bc9bbd4cc5..fef7aaddaa3 100644
--- a/mysql-test/main/replace_returning.result
+++ b/mysql-test/main/replace_returning.result
@@ -175,7 +175,7 @@ REPLACE INTO t1 VALUES(1,'a'),(2,'b'),(3,'c');
 # SIMLPE REPLACE STATEMENT
 #
 REPLACE INTO t2(id2,val2) VALUES(1,'a') RETURNING id1;
-ERROR 42S22: Unknown column 'id1' in 'field list'
+ERROR 42S22: Unknown column 'id1' in 'RETURNING'
 REPLACE INTO t2(id2,val2) values(2,'b') RETURNING SUM(id2);
 ERROR HY000: Invalid use of group function
 REPLACE INTO t2(id2,val2) VALUES(3,'c') RETURNING (SELECT id1 FROM t1);
@@ -197,7 +197,7 @@ ERROR 42S02: Unknown table 'test.t1'
 # Multiple rows in single insert statement
 #
 REPLACE INTO t2 VALUES(1,'a'),(2,'b') RETURNING id1;
-ERROR 42S22: Unknown column 'id1' in 'field list'
+ERROR 42S22: Unknown column 'id1' in 'RETURNING'
 REPLACE INTO t2 VALUES(3,'c'),(4,'d') RETURNING MAX(id2);
 ERROR HY000: Invalid use of group function
 REPLACE INTO t2 VALUES(5,'c'),(6,'f') RETURNING (SELECT id1 FROM t1);
@@ -220,7 +220,7 @@ ERROR 42S02: Unknown table 'test.t1'
 # REPLACE ... SET
 #
 REPLACE INTO t2 SET id2=1, val2='a' RETURNING id1;
-ERROR 42S22: Unknown column 'id1' in 'field list'
+ERROR 42S22: Unknown column 'id1' in 'RETURNING'
 REPLACE INTO t2 SET id2=2, val2='b' RETURNING COUNT(id2);
 ERROR HY000: Invalid use of group function
 REPLACE INTO t2 SET id2=3, val2='c' RETURNING (SELECT id1 FROM t1);
@@ -242,7 +242,7 @@ ERROR 42S02: Unknown table 'test.t1'
 # REPLACE...SELECT
 #
 REPLACE INTO t2(id2, val2) SELECT * FROM t1 WHERE id1=1 RETURNING id1;
-ERROR 42S22: Unknown column 'id1' in 'field list'
+ERROR 42S22: Unknown column 'id1' in 'RETURNING'
 REPLACE INTO t2(id2, val2) SELECT * FROM t1 WHERE id1=2 RETURNING MAX(id2);
 ERROR HY000: Invalid use of group function
 REPLACE INTO t2(id2, val2) SELECT * FROM t1 WHERE id1=2 RETURNING (SELECT
diff --git a/mysql-test/main/replace_returning_err.result b/mysql-test/main/replace_returning_err.result
index 04ccdb6c5a5..dd9d309d336 100644
--- a/mysql-test/main/replace_returning_err.result
+++ b/mysql-test/main/replace_returning_err.result
@@ -5,7 +5,7 @@ INSERT INTO t1 VALUES(1, 'a'), (2, 'b'), (3, 'c');
 # SIMLPE REPLACE STATEMENT
 #
 REPLACE INTO t2(id2, val2) VALUES(1, 'a') RETURNING id1;
-ERROR 42S22: Unknown column 'id1' in 'field list'
+ERROR 42S22: Unknown column 'id1' in 'RETURNING'
 REPLACE INTO t2(id2, val2) values(2, 'b') RETURNING SUM(id2);
 ERROR HY000: Invalid use of group function
 REPLACE INTO t2(id2, val2) VALUES(3, 'c') RETURNING(SELECT id1 FROM t1);
@@ -20,7 +20,7 @@ ERROR HY000: Table 't2' is specified twice, both as a target for 'INSERT' and as
 # Multiple rows in single replace statement
 #
 REPLACE INTO t2 VALUES(1, 'a'), (2, 'b') RETURNING id1;
-ERROR 42S22: Unknown column 'id1' in 'field list'
+ERROR 42S22: Unknown column 'id1' in 'RETURNING'
 REPLACE INTO t2 VALUES(3, 'c'), (4, 'd') RETURNING MAX(id2);
 ERROR HY000: Invalid use of group function
 REPLACE INTO t2 VALUES(5, 'c'), (6, 'f') RETURNING(SELECT id1 FROM t1);
@@ -35,7 +35,7 @@ ERROR HY000: Table 't2' is specified twice, both as a target for 'INSERT' and as
 # REPLACE ... SET
 #
 REPLACE INTO t2 SET id2 = 1, val2 = 'a' RETURNING id1;
-ERROR 42S22: Unknown column 'id1' in 'field list'
+ERROR 42S22: Unknown column 'id1' in 'RETURNING'
 REPLACE INTO t2 SET id2 = 2, val2 = 'b' RETURNING COUNT(id2);
 ERROR HY000: Invalid use of group function
 REPLACE INTO t2 SET id2 = 3, val2 = 'c' RETURNING(SELECT id1 FROM t1);
@@ -50,7 +50,7 @@ ERROR HY000: Table 't2' is specified twice, both as a target for 'INSERT' and as
 # REPLACE...SELECT
 #
 REPLACE INTO t2(id2, val2) SELECT* FROM t1 WHERE id1 = 1 RETURNING id1;
-ERROR 42S22: Unknown column 'id1' in 'field list'
+ERROR 42S22: Unknown column 'id1' in 'RETURNING'
 REPLACE INTO t2(id2, val2) SELECT* FROM t1 WHERE id1 = 2 RETURNING MAX(id2);
 ERROR HY000: Invalid use of group function
 REPLACE INTO t2(id2, val2) SELECT* FROM t1 WHERE id1 = 2 RETURNING(SELECT id1
diff --git a/mysql-test/main/select.result b/mysql-test/main/select.result
index 18602caacc1..cfa31f50718 100644
--- a/mysql-test/main/select.result
+++ b/mysql-test/main/select.result
@@ -2098,7 +2098,7 @@ DO benchmark(100,1+1),1,1;
 do default;
 ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '' at line 1
 do foobar;
-ERROR 42S22: Unknown column 'foobar' in 'field list'
+ERROR 42S22: Unknown column 'foobar' in 'DO'
 CREATE TABLE t1 (
 id mediumint(8) unsigned NOT NULL auto_increment,
 pseudo varchar(35) NOT NULL default '',
@@ -3090,13 +3090,13 @@ INSERT INTO t1 VALUES (1),(2),(3);
 INSERT INTO t2 VALUES (2);
 INSERT INTO t3 VALUES (3);
 SELECT t1.id,t3.id FROM t1 JOIN t2 ON (t2.id=t1.id) LEFT JOIN t3 USING (id);
-ERROR 23000: Column 'id' in from clause is ambiguous
+ERROR 23000: Column 'id' in FROM is ambiguous
 SELECT t1.id,t3.id FROM t1 JOIN t2 ON (t2.notacolumn=t1.id) LEFT JOIN t3 USING (id);
-ERROR 23000: Column 'id' in from clause is ambiguous
+ERROR 23000: Column 'id' in FROM is ambiguous
 SELECT id,t3.id FROM t1 JOIN t2 ON (t2.id=t1.id) LEFT JOIN t3 USING (id);
-ERROR 23000: Column 'id' in from clause is ambiguous
+ERROR 23000: Column 'id' in FROM is ambiguous
 SELECT id,t3.id FROM (t1 JOIN t2 ON (t2.id=t1.id)) LEFT JOIN t3 USING (id);
-ERROR 23000: Column 'id' in from clause is ambiguous
+ERROR 23000: Column 'id' in FROM is ambiguous
 drop table t1, t2, t3;
 create table t1 (a int(10),b int(10));
 create table t2 (a int(10),b int(10));
@@ -3121,7 +3121,7 @@ select * from t1 join t2 join t3 on (t2.b = t3.b and t1.a = t3.a);
 a	c	b	b	a
 1	1	1	1	1
 select * from t1, t2 join t3 on (t2.b = t3.b and t1.a = t3.a);
-ERROR 42S22: Unknown column 't1.a' in 'on clause'
+ERROR 42S22: Unknown column 't1.a' in 'ON'
 select * from t1 join t2 join t3 join t4 on (t1.a = t4.c and t2.b = t4.c);
 a	c	b	b	a	c
 1	1	1	1	1	1
@@ -5597,7 +5597,7 @@ drop table t1;
 CREATE TABLE t1 (a INT, b INT);
 INSERT INTO t1 VALUES (1,10),(2,20);
 SELECT b, GROUP_CONCAT(b ORDER BY 2), MIN(a) AS f FROM t1 GROUP BY b ORDER BY f;
-ERROR 42S22: Unknown column '2' in 'order clause'
+ERROR 42S22: Unknown column '2' in 'ORDER BY'
 DROP TABLE t1;
 #
 # Bug MDEV-24560 SIGSEGV in st_join_table::cleanup + server and client
diff --git a/mysql-test/main/select_jcl6.result b/mysql-test/main/select_jcl6.result
index 4ec370c08ed..cf8f4f26ae0 100644
--- a/mysql-test/main/select_jcl6.result
+++ b/mysql-test/main/select_jcl6.result
@@ -2109,7 +2109,7 @@ DO benchmark(100,1+1),1,1;
 do default;
 ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '' at line 1
 do foobar;
-ERROR 42S22: Unknown column 'foobar' in 'field list'
+ERROR 42S22: Unknown column 'foobar' in 'DO'
 CREATE TABLE t1 (
 id mediumint(8) unsigned NOT NULL auto_increment,
 pseudo varchar(35) NOT NULL default '',
@@ -3101,13 +3101,13 @@ INSERT INTO t1 VALUES (1),(2),(3);
 INSERT INTO t2 VALUES (2);
 INSERT INTO t3 VALUES (3);
 SELECT t1.id,t3.id FROM t1 JOIN t2 ON (t2.id=t1.id) LEFT JOIN t3 USING (id);
-ERROR 23000: Column 'id' in from clause is ambiguous
+ERROR 23000: Column 'id' in FROM is ambiguous
 SELECT t1.id,t3.id FROM t1 JOIN t2 ON (t2.notacolumn=t1.id) LEFT JOIN t3 USING (id);
-ERROR 23000: Column 'id' in from clause is ambiguous
+ERROR 23000: Column 'id' in FROM is ambiguous
 SELECT id,t3.id FROM t1 JOIN t2 ON (t2.id=t1.id) LEFT JOIN t3 USING (id);
-ERROR 23000: Column 'id' in from clause is ambiguous
+ERROR 23000: Column 'id' in FROM is ambiguous
 SELECT id,t3.id FROM (t1 JOIN t2 ON (t2.id=t1.id)) LEFT JOIN t3 USING (id);
-ERROR 23000: Column 'id' in from clause is ambiguous
+ERROR 23000: Column 'id' in FROM is ambiguous
 drop table t1, t2, t3;
 create table t1 (a int(10),b int(10));
 create table t2 (a int(10),b int(10));
@@ -3132,7 +3132,7 @@ select * from t1 join t2 join t3 on (t2.b = t3.b and t1.a = t3.a);
 a	c	b	b	a
 1	1	1	1	1
 select * from t1, t2 join t3 on (t2.b = t3.b and t1.a = t3.a);
-ERROR 42S22: Unknown column 't1.a' in 'on clause'
+ERROR 42S22: Unknown column 't1.a' in 'ON'
 select * from t1 join t2 join t3 join t4 on (t1.a = t4.c and t2.b = t4.c);
 a	c	b	b	a	c
 1	1	1	1	1	1
@@ -5608,7 +5608,7 @@ drop table t1;
 CREATE TABLE t1 (a INT, b INT);
 INSERT INTO t1 VALUES (1,10),(2,20);
 SELECT b, GROUP_CONCAT(b ORDER BY 2), MIN(a) AS f FROM t1 GROUP BY b ORDER BY f;
-ERROR 42S22: Unknown column '2' in 'order clause'
+ERROR 42S22: Unknown column '2' in 'ORDER BY'
 DROP TABLE t1;
 #
 # Bug MDEV-24560 SIGSEGV in st_join_table::cleanup + server and client
diff --git a/mysql-test/main/select_pkeycache.result b/mysql-test/main/select_pkeycache.result
index 18602caacc1..cfa31f50718 100644
--- a/mysql-test/main/select_pkeycache.result
+++ b/mysql-test/main/select_pkeycache.result
@@ -2098,7 +2098,7 @@ DO benchmark(100,1+1),1,1;
 do default;
 ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '' at line 1
 do foobar;
-ERROR 42S22: Unknown column 'foobar' in 'field list'
+ERROR 42S22: Unknown column 'foobar' in 'DO'
 CREATE TABLE t1 (
 id mediumint(8) unsigned NOT NULL auto_increment,
 pseudo varchar(35) NOT NULL default '',
@@ -3090,13 +3090,13 @@ INSERT INTO t1 VALUES (1),(2),(3);
 INSERT INTO t2 VALUES (2);
 INSERT INTO t3 VALUES (3);
 SELECT t1.id,t3.id FROM t1 JOIN t2 ON (t2.id=t1.id) LEFT JOIN t3 USING (id);
-ERROR 23000: Column 'id' in from clause is ambiguous
+ERROR 23000: Column 'id' in FROM is ambiguous
 SELECT t1.id,t3.id FROM t1 JOIN t2 ON (t2.notacolumn=t1.id) LEFT JOIN t3 USING (id);
-ERROR 23000: Column 'id' in from clause is ambiguous
+ERROR 23000: Column 'id' in FROM is ambiguous
 SELECT id,t3.id FROM t1 JOIN t2 ON (t2.id=t1.id) LEFT JOIN t3 USING (id);
-ERROR 23000: Column 'id' in from clause is ambiguous
+ERROR 23000: Column 'id' in FROM is ambiguous
 SELECT id,t3.id FROM (t1 JOIN t2 ON (t2.id=t1.id)) LEFT JOIN t3 USING (id);
-ERROR 23000: Column 'id' in from clause is ambiguous
+ERROR 23000: Column 'id' in FROM is ambiguous
 drop table t1, t2, t3;
 create table t1 (a int(10),b int(10));
 create table t2 (a int(10),b int(10));
@@ -3121,7 +3121,7 @@ select * from t1 join t2 join t3 on (t2.b = t3.b and t1.a = t3.a);
 a	c	b	b	a
 1	1	1	1	1
 select * from t1, t2 join t3 on (t2.b = t3.b and t1.a = t3.a);
-ERROR 42S22: Unknown column 't1.a' in 'on clause'
+ERROR 42S22: Unknown column 't1.a' in 'ON'
 select * from t1 join t2 join t3 join t4 on (t1.a = t4.c and t2.b = t4.c);
 a	c	b	b	a	c
 1	1	1	1	1	1
@@ -5597,7 +5597,7 @@ drop table t1;
 CREATE TABLE t1 (a INT, b INT);
 INSERT INTO t1 VALUES (1,10),(2,20);
 SELECT b, GROUP_CONCAT(b ORDER BY 2), MIN(a) AS f FROM t1 GROUP BY b ORDER BY f;
-ERROR 42S22: Unknown column '2' in 'order clause'
+ERROR 42S22: Unknown column '2' in 'ORDER BY'
 DROP TABLE t1;
 #
 # Bug MDEV-24560 SIGSEGV in st_join_table::cleanup + server and client
diff --git a/mysql-test/main/sp-dynamic.result b/mysql-test/main/sp-dynamic.result
index ad11763b523..c4f6f8cb0f9 100644
--- a/mysql-test/main/sp-dynamic.result
+++ b/mysql-test/main/sp-dynamic.result
@@ -228,9 +228,9 @@ prepare stmt from "select 'dynamic sql:', @a, a";
 execute stmt;
 end|
 call p1()|
-ERROR 42S22: Unknown column 'a' in 'field list'
+ERROR 42S22: Unknown column 'a' in 'SELECT'
 call p1()|
-ERROR 42S22: Unknown column 'a' in 'field list'
+ERROR 42S22: Unknown column 'a' in 'SELECT'
 set sql_mode= DEFAULT|
 drop procedure p1|
 create procedure p1()
diff --git a/mysql-test/main/sp-error.result b/mysql-test/main/sp-error.result
index 3832d63c073..f6f2c95f714 100644
--- a/mysql-test/main/sp-error.result
+++ b/mysql-test/main/sp-error.result
@@ -1,4 +1,3 @@
-drop table if exists t1, t2;
 SELECT * FROM mysql.proc INTO OUTFILE 'MYSQLTEST_VARDIR/tmp/proc.txt';
 Warnings:
 Warning	1287	'<select expression> INTO <destination>;' is deprecated and will be removed in a future release. Please use 'SELECT <select list> INTO <destination> FROM...' instead
@@ -9,7 +8,6 @@ create procedure syntaxerror(t int)|
 ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '' at line 1
 create procedure syntaxerror(t int)|
 ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '' at line 1
-drop table if exists t3|
 create table t3 ( x int )|
 insert into t3 values (2), (3)|
 create procedure bad_into(out param int)
@@ -166,7 +164,6 @@ open cc;
 close c;
 end|
 ERROR 42000: Undefined CURSOR: cc
-drop table if exists t1|
 create table t1 (val int)|
 create procedure p()
 begin
@@ -191,7 +188,6 @@ drop procedure p|
 alter procedure bar3 sql security invoker|
 ERROR 42000: PROCEDURE test.bar3 does not exist
 drop table t1|
-drop table if exists t1|
 create table t1 (val int, x float)|
 insert into t1 values (42, 3.1), (19, 1.2)|
 create procedure p()
@@ -276,7 +272,6 @@ declare continue handler for sqlstate '42S99' set x = 1;
 declare c cursor for select * from t1;
 end|
 ERROR 42000: Cursor declaration after handler declaration
-drop procedure if exists p|
 create procedure p(in x int, inout y int, out z int)
 begin
 set y = x+y;
@@ -307,7 +302,6 @@ lock tables t1 read, mysql.proc read|
 unlock tables|
 lock tables mysql.proc write|
 unlock tables|
-drop function if exists f1|
 create function f1(i int) returns int
 begin
 insert into t1 (val) values (i);
@@ -344,16 +338,15 @@ open c;
 close c;
 end|
 call bug1965()|
-ERROR 42S22: Unknown column 'valname' in 'order clause'
+ERROR 42S22: Unknown column 'valname' in 'ORDER BY'
 drop procedure bug1965|
 select 1 into a|
 ERROR 42000: Undeclared variable: a
-drop table if exists t3|
 create table t3 (column_1_0 int)|
 create procedure bug1653()
 update t3 set column_1 = 0|
 call bug1653()|
-ERROR 42S22: Unknown column 'column_1' in 'field list'
+ERROR 42S22: Unknown column 'column_1' in 'SET'
 drop table t3|
 create table t3 (column_1 int)|
 call bug1653()|
@@ -375,7 +368,7 @@ update t1 set v = 42;
 end|
 insert into t1 values (666, 51.3)|
 call bug2272()|
-ERROR 42S22: Unknown column 'v' in 'field list'
+ERROR 42S22: Unknown column 'v' in 'SET'
 truncate table t1|
 drop procedure bug2272|
 create procedure bug2329_1()
@@ -389,9 +382,9 @@ declare v int;
 replace t1 set v = 5;
 end|
 call bug2329_1()|
-ERROR 42S22: Unknown column 'v' in 'field list'
+ERROR 42S22: Unknown column 'v' in 'INSERT INTO'
 call bug2329_2()|
-ERROR 42S22: Unknown column 'v' in 'field list'
+ERROR 42S22: Unknown column 'v' in 'INSERT INTO'
 drop procedure bug2329_1|
 drop procedure bug2329_2|
 create function bug3287() returns int
@@ -415,7 +408,6 @@ end case|
 call bug3287(2)|
 ERROR 20000: Case not found for CASE statement
 drop procedure bug3287|
-drop table if exists t3|
 create table t3 (s1 int, primary key (s1))|
 insert into t3 values (5),(6)|
 create procedure bug3279(out y int) 
@@ -457,7 +449,6 @@ create procedure bug4344() drop procedure bug4344|
 ERROR HY000: Can't drop or alter a PROCEDURE from within another stored routine
 create procedure bug4344() drop function bug4344|
 ERROR HY000: Can't drop or alter a FUNCTION from within another stored routine
-drop procedure if exists bug3294|
 create procedure bug3294()
 begin
 declare continue handler for sqlexception drop table t5;
@@ -468,10 +459,6 @@ create table t5 (x int)|
 call bug3294()|
 ERROR 42S02: Unknown table 'test.t5'
 drop procedure bug3294|
-drop procedure if exists bug8776_1|
-drop procedure if exists bug8776_2|
-drop procedure if exists bug8776_3|
-drop procedure if exists bug8776_4|
 create procedure bug8776_1()
 begin
 declare continue handler for sqlstate '42S0200test' begin end;
@@ -505,7 +492,6 @@ ERROR 0A000: LOCK is not allowed in stored procedures
 create procedure bug6600()
 unlock table t1|
 ERROR 0A000: UNLOCK is not allowed in stored procedures
-drop procedure if exists bug9566|
 create procedure bug9566()
 begin
 select * from t1;
@@ -515,7 +501,6 @@ alter procedure bug9566 comment 'Some comment'|
 ERROR HY000: Can't execute the given command because you have active locked tables or an active transaction
 unlock tables|
 drop procedure bug9566|
-drop procedure if exists bug7299|
 create procedure bug7299()
 begin
 declare v int;
@@ -556,7 +541,6 @@ declare exit handler for condname1 select 1;
 declare exit handler for sqlstate '42000' select 2;
 end|
 ERROR 42000: Duplicate handler declared in the same block
-drop procedure if exists bug9073|
 create procedure bug9073()
 begin
 declare condname1 condition for sqlstate '42000';
@@ -597,8 +581,6 @@ select b;
 return b;
 end|
 ERROR 0A000: Not allowed to return a result set from a function
-drop function if exists bug8408_f|
-drop procedure if exists bug8408_p|
 create function bug8408_f() returns int
 begin
 call bug8408_p();
@@ -626,11 +608,9 @@ val	x	bug8408()
 7	7	3
 drop function bug8408|
 truncate table t1|
-drop procedure if exists bug10537|
 create procedure bug10537()
 load data local infile '/tmp/somefile' into table t1|
 ERROR 0A000: LOAD DATA is not allowed in stored procedures
-drop function if exists bug8409|
 create function bug8409()
 returns int
 begin
@@ -681,7 +661,6 @@ create procedure bug9529_9012345678901234567890123456789012345678901234567890123
 begin
 end|
 ERROR 42000: Identifier name 'bug9529_901234567890123456789012345678901234567890123456789012345' is too long
-drop procedure if exists bug17015_0123456789012345678901234567890123456789012345678901234|
 create procedure bug17015_0123456789012345678901234567890123456789012345678901234()
 begin
 end|
@@ -689,7 +668,6 @@ show procedure status like 'bug17015%'|
 Db	Name	Type	Definer	Modified	Created	Security_type	Comment	character_set_client	collation_connection	Database Collation
 test	bug17015_0123456789012345678901234567890123456789012345678901234	PROCEDURE	root@localhost	0000-00-00 00:00:00	0000-00-00 00:00:00	DEFINER		latin1	latin1_swedish_ci	latin1_swedish_ci
 drop procedure bug17015_0123456789012345678901234567890123456789012345678901234|
-drop procedure if exists bug10969|
 create procedure bug10969()
 begin
 declare s1 int default 0;
@@ -733,10 +711,6 @@ TEMP_SUM
 ERROR 24000: Cursor is not open
 drop procedure SP001;
 drop table t1, t2;
-drop function if exists bug11394|
-drop function if exists bug11394_1|
-drop function if exists bug11394_2|
-drop procedure if exists bug11394|
 create function bug11394(i int) returns int
 begin
 if i <= 0 then
@@ -784,8 +758,6 @@ CREATE TABLE t_bug_12490(a int);
 CREATE TRIGGER BUG_12490 BEFORE UPDATE ON t_bug_12490 FOR EACH ROW HELP CONTENTS;
 ERROR 0A000: HELP is not allowed in stored procedures
 DROP TABLE t_bug_12490;
-drop function if exists bug11834_1;
-drop function if exists bug11834_2;
 create function bug11834_1() returns int return 10;
 create function bug11834_2() returns int return bug11834_1();
 prepare stmt from "select bug11834_2()";
@@ -800,14 +772,12 @@ execute stmt;
 ERROR 42000: FUNCTION test.bug11834_1 does not exist
 deallocate prepare stmt;
 drop function bug11834_2;
-DROP FUNCTION IF EXISTS bug12953|
 CREATE FUNCTION bug12953() RETURNS INT
 BEGIN
 OPTIMIZE TABLE t1;
 RETURN 1;
 END|
 ERROR 0A000: Not allowed to return a result set from a function
-DROP FUNCTION IF EXISTS bug12995|
 CREATE FUNCTION bug12995() RETURNS INT
 BEGIN
 HANDLER t1 OPEN;
@@ -828,8 +798,6 @@ END|
 ERROR 0A000: HANDLER is not allowed in stored procedures
 SELECT bug12995()|
 ERROR 42000: FUNCTION test.bug12995 does not exist
-drop procedure if exists bug12712;
-drop function if exists bug12712;
 create procedure bug12712()
 set session autocommit = 0;
 select @@autocommit;
@@ -875,10 +843,6 @@ ERROR HY000: Not allowed to set autocommit from a stored function or trigger
 create trigger bug12712
 before insert on t1 for each row set session autocommit = 0;
 ERROR HY000: Not allowed to set autocommit from a stored function or trigger
-drop procedure if exists bug13510_1|
-drop procedure if exists bug13510_2|
-drop procedure if exists bug13510_3|
-drop procedure if exists bug13510_4|
 create procedure bug13510_1()
 begin
 declare password varchar(10);
@@ -915,7 +879,6 @@ names
 foo4
 drop procedure bug13510_3|
 drop procedure bug13510_4|
-drop function if exists bug_13627_f|
 CREATE TABLE t1 (a int)|
 CREATE TRIGGER tr1 BEFORE INSERT ON t1 FOR EACH ROW BEGIN DROP TRIGGER test1; END |
 ERROR HY000: Explicit or implicit commit is not allowed in stored function or trigger
@@ -1058,9 +1021,6 @@ select count(*) into param1 from t3;
 end|
 ERROR 3D000: No database selected
 use test;
-DROP PROCEDURE IF EXISTS bug13037_p1;
-DROP PROCEDURE IF EXISTS bug13037_p2;
-DROP PROCEDURE IF EXISTS bug13037_p3;
 CREATE PROCEDURE bug13037_p1()
 BEGIN
 IF bug13037_foo THEN
@@ -1078,13 +1038,13 @@ SELECT bug13037_foo;
 END|
 
 CALL bug13037_p2();
-ERROR 42S22: Unknown column 'bug13037_bar' in 'field list'
+ERROR 42S22: Unknown column 'bug13037_bar' in 'SET'
 CALL bug13037_p3();
-ERROR 42S22: Unknown column 'bug13037_foo' in 'field list'
+ERROR 42S22: Unknown column 'bug13037_foo' in 'SELECT'
 CALL bug13037_p2();
-ERROR 42S22: Unknown column 'bug13037_bar' in 'field list'
+ERROR 42S22: Unknown column 'bug13037_bar' in 'SET'
 CALL bug13037_p3();
-ERROR 42S22: Unknown column 'bug13037_foo' in 'field list'
+ERROR 42S22: Unknown column 'bug13037_foo' in 'SELECT'
 DROP PROCEDURE bug13037_p2;
 DROP PROCEDURE bug13037_p3;
 create database mysqltest1;
@@ -1100,7 +1060,6 @@ Db	Name	Type	Definer	Modified	Created	Security_type	Comment	character_set_client
 mysqltest2	p1	PROCEDURE	root@localhost	0000-00-00 00:00:00	0000-00-00 00:00:00	DEFINER		latin1	latin1_swedish_ci	latin1_swedish_ci
 drop database mysqltest2;
 use test;
-DROP FUNCTION IF EXISTS bug13012|
 CREATE FUNCTION bug13012() RETURNS INT
 BEGIN
 REPAIR TABLE t1;
@@ -1119,9 +1078,6 @@ ERROR 0A000: Not allowed to return a result set from a function
 drop table t1|
 drop procedure bug13012_1|
 drop function bug13012_2|
-drop function if exists bug11555_1;
-drop function if exists bug11555_2;
-drop view if exists v1, v2, v3, v4;
 create function bug11555_1() returns int return (select max(i) from t1);
 create function bug11555_2() returns int return bug11555_1();
 create view v1 as select bug11555_1();
@@ -1158,7 +1114,6 @@ ERROR 42S02: Table 'test.t2' doesn't exist
 drop function bug11555_1;
 drop table t1;
 drop view v1;
-drop procedure if exists ` bug15658`;
 create procedure ``() select 1;
 ERROR 42000: Incorrect routine name ''
 create procedure ` `() select 1;
@@ -1177,8 +1132,6 @@ show procedure status;
 Db	Name	Type	Definer	Modified	Created	Security_type	Comment	character_set_client	collation_connection	Database Collation
 test	 bug15658	PROCEDURE	root@localhost	0000-00-00 00:00:00	0000-00-00 00:00:00	DEFINER		latin1	latin1_swedish_ci	latin1_swedish_ci
 drop procedure ` bug15658`;
-drop function if exists bug14270;
-drop table if exists t1;
 create table t1 (s1 int primary key);
 create function bug14270() returns int
 begin
@@ -1193,7 +1146,6 @@ return 1;
 end|
 ERROR 0A000: Not allowed to return a result set from a function
 drop table t1;
-drop procedure if exists bug15091;
 create procedure bug15091()
 begin
 declare selectstr varchar(6000) default ' ';
@@ -1204,10 +1156,8 @@ c.operatorid,
 'in (',conditionstr, ')');
 end|
 ERROR 42000: Undeclared variable: c
-drop function if exists bug16896;
 create aggregate function bug16896() returns int return 1;
 ERROR HY000: Aggregate specific instruction(FETCH GROUP NEXT ROW) missing from the aggregate function
-DROP PROCEDURE IF EXISTS bug14702;
 CREATE IF NOT EXISTS PROCEDURE bug14702()
 BEGIN
 END;
@@ -1218,7 +1168,6 @@ CREATE PROCEDURE IF NOT EXISTS bug14702()
 BEGIN
 END;
 DROP PROCEDURE IF EXISTS bug14702;
-DROP TABLE IF EXISTS t1;
 CREATE TABLE t1 (i INT);
 CREATE PROCEDURE bug20953() CREATE VIEW v AS SELECT 1 INTO @a;
 ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'INTO @a' at line 1
@@ -1242,30 +1191,23 @@ ERROR HY000: View's SELECT contains a variable or parameter
 PREPARE stmt FROM "CREATE VIEW v AS SELECT ?";
 ERROR HY000: View's SELECT contains a variable or parameter
 DROP TABLE t1;
-drop tables if exists t1;
-drop procedure if exists bug24491;
 create table t1 (id int primary key auto_increment, value varchar(10));
 insert into t1 (id, value) values (1, 'FIRST'), (2, 'SECOND'), (3, 'THIRD');
 create procedure bug24491()
 insert into t1 (id, value) select * from (select 4 as i, 'FOURTH' as v) as y on duplicate key update v = 'DUP';
 call bug24491();
-ERROR 42S22: Unknown column 'v' in 'field list'
+ERROR 42S22: Unknown column 'v' in 'UPDATE'
 call bug24491();
-ERROR 42S22: Unknown column 'v' in 'field list'
+ERROR 42S22: Unknown column 'v' in 'UPDATE'
 drop procedure bug24491;
 create procedure bug24491()
 insert into t1 (id, value) select * from (select 4 as id, 'FOURTH' as value) as y on duplicate key update y.value = 'DUP';
 call bug24491();
-ERROR 42S22: Unknown column 'y.value' in 'field list'
+ERROR 42S22: Unknown column 'y.value' in 'UPDATE'
 call bug24491();
-ERROR 42S22: Unknown column 'y.value' in 'field list'
+ERROR 42S22: Unknown column 'y.value' in 'UPDATE'
 drop procedure bug24491;
 drop tables t1;
-DROP FUNCTION IF EXISTS bug18914_f1;
-DROP FUNCTION IF EXISTS bug18914_f2;
-DROP PROCEDURE IF EXISTS bug18914_p1;
-DROP PROCEDURE IF EXISTS bug18914_p2;
-DROP TABLE IF EXISTS t1, t2;
 CREATE TABLE t1 (i INT);
 CREATE PROCEDURE bug18914_p1() CREATE TABLE t2 (i INT);
 CREATE PROCEDURE bug18914_p2() DROP TABLE IF EXISTS no_such_table;
@@ -1294,9 +1236,6 @@ DROP FUNCTION bug18914_f2;
 DROP PROCEDURE bug18914_p1;
 DROP PROCEDURE bug18914_p2;
 DROP TABLE t1;
-drop table if exists bogus_table_20713;
-drop function if exists func_20713_a;
-drop function if exists func_20713_b;
 create table bogus_table_20713( id int(10) not null primary key);
 insert into bogus_table_20713 values (1), (2), (3);
 create function func_20713_a() returns int(11)
@@ -1348,11 +1287,6 @@ select @in_func;
 2
 drop function if exists func_20713_a;
 drop function if exists func_20713_b;
-drop table if exists table_25345_a;
-drop table if exists table_25345_b;
-drop procedure if exists proc_25345;
-drop function if exists func_25345;
-drop function if exists func_25345_b;
 create table table_25345_a (a int);
 create table table_25345_b (b int);
 create procedure proc_25345()
@@ -1394,14 +1328,12 @@ drop procedure proc_25345;
 drop function func_25345;
 drop function func_25345_b;
 End of 5.0 tests
-drop function if exists bug16164;
 create function bug16164() returns int
 begin
 show authors;
 return 42;
 end|
 ERROR 0A000: Not allowed to return a result set from a function
-drop function if exists bug20701;
 create function bug20701() returns varchar(25) binary return "test";
 drop function bug20701;
 create function bug20701() returns varchar(25) return "test";
@@ -1458,8 +1390,6 @@ end
 until true end repeat retry;
 end//
 ERROR 42000: LEAVE with no matching label: retry
-drop procedure if exists proc_28360;
-drop function if exists func_28360;
 CREATE PROCEDURE proc_28360()
 BEGIN
 ALTER DATABASE `#mysql50#upgrade-me` UPGRADE DATA DIRECTORY NAME;
@@ -1471,7 +1401,6 @@ ALTER DATABASE `#mysql50#upgrade-me` UPGRADE DATA DIRECTORY NAME;
 RETURN 0;
 END//
 ERROR HY000: Can't drop or alter a DATABASE from within another stored routine
-DROP PROCEDURE IF EXISTS p1;
 CREATE PROCEDURE p1()
 BEGIN
 DECLARE c char(100);
@@ -1487,7 +1416,6 @@ FETCH cur1 INTO c;
 select c;
 CLOSE cur1;
 END' at line 4
-DROP DATABASE IF EXISTS mysqltest;
 CREATE DATABASE mysqltest;
 USE mysqltest;
 DROP DATABASE mysqltest;
@@ -1509,9 +1437,6 @@ ERROR HY000: Not allowed to set autocommit from a stored function or trigger
 create trigger t1
 before insert on t2 for each row set password = password('foo');|
 ERROR HY000: Not allowed to set autocommit from a stored function or trigger
-drop function if exists f1;
-drop function if exists f2;
-drop table if exists t1, t2;
 create function f1() returns int
 begin
 drop temporary table t1;
@@ -1557,10 +1482,6 @@ drop function f2;
 drop table t2;
 ERROR 42S02: Unknown table 'test.t2'
 End of 5.1 tests
-drop procedure if exists proc_33983_a;
-drop procedure if exists proc_33983_b;
-drop procedure if exists proc_33983_c;
-drop procedure if exists proc_33983_d;
 create procedure proc_33983_a()
 begin
 label1:
@@ -1612,7 +1533,6 @@ CALL p1((SELECT * FROM t1))|
 ERROR 21000: Subquery returns more than 1 row
 DROP PROCEDURE IF EXISTS p1|
 DROP TABLE t1|
-drop procedure if exists p1;
 create procedure p1()
 begin
 create table t1 (a int) engine=MyISAM;
@@ -1621,7 +1541,6 @@ end|
 call p1();
 call p1();
 drop procedure p1;
-drop procedure if exists proc_8759;
 create procedure proc_8759()
 begin
 declare should_be_illegal condition for sqlstate '00000';
@@ -1633,7 +1552,6 @@ begin
 declare continue handler for sqlstate '00000' set @x=0;
 end$$
 ERROR 42000: Bad SQLSTATE: '00000'
-drop procedure if exists proc_36510;
 create procedure proc_36510()
 begin
 declare should_be_illegal condition for sqlstate '00123';
@@ -1656,7 +1574,6 @@ begin
 declare continue handler for 0 set @x=0;
 end$$
 ERROR HY000: Incorrect CONDITION value: '0'
-drop procedure if exists p1;
 set @old_recursion_depth = @@max_sp_recursion_depth;
 set @@max_sp_recursion_depth = 255;
 create procedure p1(a int)
@@ -1728,12 +1645,6 @@ End of 5.1 tests
 
 # - Case 1
 
-DROP PROCEDURE IF EXISTS p1;
-DROP PROCEDURE IF EXISTS p2;
-DROP PROCEDURE IF EXISTS p3;
-DROP PROCEDURE IF EXISTS p4;
-DROP PROCEDURE IF EXISTS p5;
-DROP PROCEDURE IF EXISTS p6;
 CREATE PROCEDURE p1()
 BEGIN
 SELECT CAST('10 ' as unsigned integer);
@@ -1827,7 +1738,6 @@ DROP PROCEDURE p6;
 
 # - Case 3: check that "Exception trumps No Data".
 
-DROP TABLE IF EXISTS t1;
 CREATE TABLE t1(a INT);
 INSERT INTO t1 VALUES (1), (2), (3);
 CREATE PROCEDURE p1()
@@ -1856,8 +1766,6 @@ DROP TABLE t1;
 #
 # Bug#36185: Incorrect precedence for warning and exception handlers
 #
-DROP TABLE IF EXISTS t1;
-DROP PROCEDURE IF EXISTS p1;
 CREATE TABLE t1 (a INT, b INT NOT NULL);
 CREATE PROCEDURE p1()
 BEGIN
@@ -1929,9 +1837,6 @@ SET sql_mode = @sql_mode_saved;
 #
 # Bug#55850: Trigger warnings not cleared.
 #
-DROP TABLE IF EXISTS t1;
-DROP TABLE IF EXISTS t2;
-DROP PROCEDURE IF EXISTS p1;
 CREATE TABLE t1(x SMALLINT, y SMALLINT, z SMALLINT);
 CREATE TABLE t2(a SMALLINT, b SMALLINT, c SMALLINT,
 d SMALLINT, e SMALLINT, f SMALLINT);
@@ -2551,8 +2456,6 @@ DROP PROCEDURE p13;
 
 # Bug#12731619: NESTED SP HANDLERS CAN TRIGGER ASSERTION
 
-DROP FUNCTION IF EXISTS f1;
-DROP TABLE IF EXISTS t1;
 CREATE TABLE t1(msg VARCHAR(255));
 CREATE FUNCTION f1() RETURNS INT
 BEGIN
@@ -2593,13 +2496,6 @@ DROP TABLE t1;
 
 # Check that handled SQL-conditions are properly cleared from DA.
 
-DROP TABLE IF EXISTS t1;
-DROP TABLE IF EXISTS t2;
-DROP PROCEDURE IF EXISTS p1;
-DROP PROCEDURE IF EXISTS p2;
-DROP PROCEDURE IF EXISTS p3;
-DROP PROCEDURE IF EXISTS p4;
-DROP PROCEDURE IF EXISTS p5;
 CREATE TABLE t1(a CHAR, b CHAR, c CHAR);
 CREATE TABLE t2(a SMALLINT, b SMALLINT, c SMALLINT);
 
@@ -2769,8 +2665,6 @@ DROP TABLE t2;
 # Check DECLARE statements that raise conditions before handlers
 # are declared.
 
-DROP PROCEDURE IF EXISTS p1;
-DROP PROCEDURE IF EXISTS p2;
 SET sql_mode = ''|
 CREATE PROCEDURE p1()
 BEGIN
@@ -2798,8 +2692,6 @@ DROP PROCEDURE p2;
 #
 # Bug#13113222 RQG_SIGNAL_RESIGNAL FAILED WITH ASSERTION.
 #
-DROP PROCEDURE IF EXISTS p1;
-DROP PROCEDURE IF EXISTS p2;
 CREATE PROCEDURE p1()
 BEGIN
 DECLARE CONTINUE HANDLER FOR SQLEXCEPTION SELECT 'triggered p1';
@@ -2825,9 +2717,6 @@ DROP PROCEDURE p2;
 # Bug#12652873: 61392: Continue handler for NOT FOUND being triggered
 # from internal stored function.
 
-DROP FUNCTION IF EXISTS f1;
-DROP FUNCTION IF EXISTS f2;
-DROP TABLE IF EXISTS t1;
 
 CREATE TABLE t1 (a INT, b INT);
 INSERT INTO t1 VALUES (1, 2);
diff --git a/mysql-test/main/sp-error.test b/mysql-test/main/sp-error.test
index bb9868be1a1..d8c265335e4 100644
--- a/mysql-test/main/sp-error.test
+++ b/mysql-test/main/sp-error.test
@@ -4,10 +4,6 @@
 
 --source include/default_charset.inc
 
---disable_warnings
-drop table if exists t1, t2;
---enable_warnings
-
 --disable_ps2_protocol
 # Backup the mysql.proc table
 --enable_prepare_warnings
@@ -25,11 +21,11 @@ delimiter |;
 # This should give three syntax errors (sometimes crashed; bug #643)
 # (Unfortunately, this is not a 100% test, on some platforms this
 #  passed despite the bug.)
---error 1064
+--error ER_PARSE_ERROR
 create procedure syntaxerror(t int)|
---error 1064
+--error ER_PARSE_ERROR
 create procedure syntaxerror(t int)|
---error 1064
+--error ER_PARSE_ERROR
 create procedure syntaxerror(t int)|
 
 # Check that we get the right error, i.e. UDF declaration parses correctly,
@@ -37,13 +33,10 @@ create procedure syntaxerror(t int)|
 #    This generates an error message containing a misleading errno which
 #    might vary between systems (it usually doesn't have anything to do with
 #    the actual failing dlopen()).
-#--error 1126
+#--error ER_CANT_OPEN_LIBRARY
 #create function foo returns real soname "foo.so"|
 
 
---disable_warnings
-drop table if exists t3|
---enable_warnings
 create table t3 ( x int )|
 insert into t3 values (2), (3)|
 
@@ -52,7 +45,7 @@ create procedure bad_into(out param int)
   select x from t3 into param|
 --disable_prepare_warnings
 
---error 1172
+--error ER_TOO_MANY_ROWS
 call bad_into(@x)|
 
 drop procedure bad_into|
@@ -66,18 +59,18 @@ create function func1() returns int
   return 42|
 
 # Can't create recursively
---error 1303
+--error ER_SP_NO_RECURSIVE_CREATE
 create procedure foo()
   create procedure bar() set @x=3|
---error 1303
+--error ER_SP_NO_RECURSIVE_CREATE
 create procedure foo()
   create function bar() returns double return 2.3|
 
 # Already exists
---error 1304
+--error ER_SP_ALREADY_EXISTS
 create procedure proc1()
   set @x = 42|
---error 1304
+--error ER_SP_ALREADY_EXISTS
 create function func1() returns int
   return 42|
 
@@ -85,41 +78,41 @@ drop procedure proc1|
 drop function func1|
 
 # Does not exist
---error 1305
+--error ER_SP_DOES_NOT_EXIST
 alter procedure foo|
---error 1305
+--error ER_SP_DOES_NOT_EXIST
 alter function foo|
---error 1305
+--error ER_SP_DOES_NOT_EXIST
 drop procedure foo|
---error 1305
+--error ER_SP_DOES_NOT_EXIST
 drop function foo|
---error 1305
+--error ER_SP_DOES_NOT_EXIST
 call foo()|
 drop procedure if exists foo|
---error 1305
+--error ER_SP_DOES_NOT_EXIST
 show create procedure foo|
---error 1305
+--error ER_SP_DOES_NOT_EXIST
 show create function foo|
 
 # LEAVE/ITERATE with no match
---error 1308
+--error ER_SP_LILABEL_MISMATCH
 create procedure foo()
 foo: loop
   leave bar;
 end loop|
---error 1308
+--error ER_SP_LILABEL_MISMATCH
 create procedure foo()
 foo: loop
   iterate bar;
 end loop|
---error 1308
+--error ER_SP_LILABEL_MISMATCH
 create procedure foo()
 foo: begin
   iterate foo;
 end|
 
 # Redefining label
---error 1309
+--error ER_SP_LABEL_REDEFINE
 create procedure foo()
 foo: loop
   foo: loop
@@ -128,14 +121,14 @@ foo: loop
 end loop foo|
 
 # End label mismatch
---error 1310
+--error ER_SP_LABEL_MISMATCH
 create procedure foo()
 foo: loop
   set @x=2;
 end loop bar|
 
 # RETURN in FUNCTION only
---error 1313
+--error ER_SP_BADRETURN
 create procedure foo()
   return 42|
 
@@ -145,19 +138,19 @@ create procedure p(x int)
 create function f(x int) returns int
   return x+42|
 
---error 1318
+--error ER_SP_WRONG_NO_OF_ARGS
 call p()|
---error 1318
+--error ER_SP_WRONG_NO_OF_ARGS
 call p(1, 2)|
---error 1318
+--error ER_SP_WRONG_NO_OF_ARGS
 select f()|
---error 1318
+--error ER_SP_WRONG_NO_OF_ARGS
 select f(1, 2)|
 
 drop procedure p|
 drop function f|
 
---error 1319 
+--error ER_SP_COND_MISMATCH 
 create procedure p(val int, out res int)
 begin
   declare x int default 0;
@@ -171,7 +164,7 @@ begin
   end if;
 end|
 
---error 1319 
+--error ER_SP_COND_MISMATCH 
 create procedure p(val int, out res int)
 begin
   declare x int default 0;
@@ -186,7 +179,7 @@ begin
   end if;
 end|
 
---error 1320
+--error ER_SP_NORETURN
 create function f(val int) returns int
 begin
   declare x int;
@@ -204,7 +197,7 @@ begin
   end if;
 end|
 
---error 1321
+--error ER_SP_NORETURNEND
 select f(10)|
 
 drop function f|
@@ -218,7 +211,7 @@ begin
   close c;
 end|
 
---error 1323
+--error ER_SP_BAD_CURSOR_SELECT
 create procedure p()
 begin
   declare x int;
@@ -228,7 +221,7 @@ begin
   close c;
 end|
 
---error 1324
+--error ER_SP_CURSOR_MISMATCH
 create procedure p()
 begin
   declare c cursor for select * from test.t;
@@ -237,9 +230,6 @@ begin
   close c;
 end|
 
---disable_warnings
-drop table if exists t1|
---enable_warnings
 create table t1 (val int)|
 
 create procedure p()
@@ -250,7 +240,7 @@ begin
   open c;
   close c;
 end|
---error 1325
+--error ER_SP_CURSOR_ALREADY_OPEN
 call p()|
 drop procedure p|
 
@@ -262,22 +252,19 @@ begin
   close c;
   close c;
 end|
---error 1326
+--error ER_SP_CURSOR_NOT_OPEN
 call p()|
 drop procedure p|
 
---error 1305
+--error ER_SP_DOES_NOT_EXIST
 alter procedure bar3 sql security invoker|
 
 drop table t1|
 
---disable_warnings
-drop table if exists t1|
---enable_warnings
 create table t1 (val int, x float)|
 insert into t1 values (42, 3.1), (19, 1.2)|
 
---error 1327
+--error ER_SP_UNDECLARED_VAR
 create procedure p()
 begin
   declare x int;
@@ -297,7 +284,7 @@ begin
   fetch c into x;
   close c;
 end|
---error 1328
+--error ER_SP_WRONG_NO_OF_FETCH_ARGS
 call p()|
 drop procedure p|
 
@@ -312,34 +299,34 @@ begin
   fetch c into x, y, z;
   close c;
 end|
---error 1328
+--error ER_SP_WRONG_NO_OF_FETCH_ARGS
 call p()|
 drop procedure p|
 
---error 1330
+--error ER_SP_DUP_PARAM
 create procedure p(in x int, x char(10))
 begin
 end|
---error 1330
+--error ER_SP_DUP_PARAM
 create function p(x int, x char(10))
 begin
 end|
 
---error 1331
+--error ER_SP_DUP_VAR
 create procedure p()
 begin
   declare x float;
   declare x int;
 end|
 
---error 1332
+--error ER_SP_DUP_COND
 create procedure p()
 begin
   declare c condition for 1064;
   declare c condition for 1065;
 end|
 
---error 1333
+--error ER_SP_DUP_CURS
 create procedure p()
 begin
   declare c cursor for select * from t1;
@@ -352,13 +339,13 @@ create procedure u()
   use sptmp|
 
 # Enforced standard order of declarations
---error 1337
+--error ER_SP_VARCOND_AFTER_CURSHNDLR
 create procedure p()
 begin
   declare c cursor for select * from t1;
   declare x int;
 end|
---error 1337
+--error ER_SP_VARCOND_AFTER_CURSHNDLR
 create procedure p()
 begin
   declare x int;
@@ -366,7 +353,7 @@ begin
   declare foo condition for sqlstate '42S99';
 end|
 
---error 1338
+--error ER_SP_CURSOR_AFTER_HANDLER
 create procedure p()
 begin
   declare x int;
@@ -375,9 +362,6 @@ begin
 end|
 
 # Check in and inout arguments.
---disable_warnings
-drop procedure if exists p|
---enable_warnings
 create procedure p(in x int, inout y int, out z int)
 begin
   set y = x+y;
@@ -427,9 +411,6 @@ unlock tables|
 # are used by statements which invoke these functions.
 #
 --disable_ps2_protocol
---disable_warnings
-drop function if exists f1|
---enable_warnings
 create function f1(i int) returns int
 begin
   insert into t1 (val) values (i);
@@ -462,28 +443,25 @@ begin
   close c;
 end|
 
---error 1054
+--error ER_BAD_FIELD_ERROR
 call bug1965()|
 drop procedure bug1965|
 
 #
 # BUG#1966
 #
---error 1327
+--error ER_SP_UNDECLARED_VAR
 select 1 into a|
 
 #
 # BUG#1653
 #
---disable_warnings
-drop table if exists t3|
---enable_warnings
 create table t3 (column_1_0 int)|
 
 create procedure bug1653()
   update t3 set column_1 = 0|
 
---error 1054
+--error ER_BAD_FIELD_ERROR
 call bug1653()|
 drop table t3|
 create table t3 (column_1 int)|
@@ -505,7 +483,7 @@ begin
   fetch c1 into v1;
 end|
 
---error 1326
+--error ER_SP_CURSOR_NOT_OPEN
 call bug2259()|
 drop procedure bug2259|
 
@@ -520,7 +498,7 @@ begin
 end|
 
 insert into t1 values (666, 51.3)|
---error 1054
+--error ER_BAD_FIELD_ERROR
 call bug2272()|
 truncate table t1|
 drop procedure bug2272|
@@ -542,9 +520,9 @@ begin
   replace t1 set v = 5;
 end|
 
---error 1054
+--error ER_BAD_FIELD_ERROR
 call bug2329_1()|
---error 1054
+--error ER_BAD_FIELD_ERROR
 call bug2329_2()|
 drop procedure bug2329_1|
 drop procedure bug2329_2|
@@ -561,7 +539,7 @@ begin
   end case;
   return 2;
 end|
---error 1339
+--error ER_SP_CASE_NOT_FOUND
 select bug3287()|
 drop function bug3287|
 
@@ -572,16 +550,13 @@ when 0 then
 when 1 then
   insert into test.t1 values (x, 1.1);
 end case|
---error 1339
+--error ER_SP_CASE_NOT_FOUND
 call bug3287(2)|
 drop procedure bug3287|
 
 #
 # BUG#3297
 #
---disable_warnings
-drop table if exists t3|
---enable_warnings
 create table t3 (s1 int, primary key (s1))|
 insert into t3 values (5),(6)|
 
@@ -609,7 +584,7 @@ drop table t3|
 #
 # BUG#3339
 #
---error 1049
+--error ER_BAD_DB_ERROR
 create procedure nodb.bug3339() begin end|
 
 #
@@ -634,17 +609,14 @@ end|
 #
 # BUG#4344
 #
---error 1357
+--error ER_SP_NO_DROP_SP
 create procedure bug4344() drop procedure bug4344|
---error 1357
+--error ER_SP_NO_DROP_SP
 create procedure bug4344() drop function bug4344|
 
 #
 # BUG#3294: Stored procedure crash if table dropped before use
 # (Actually, when an error occurs within an error handler.)
---disable_warnings
-drop procedure if exists bug3294|
---enable_warnings
 create procedure bug3294()
 begin
   declare continue handler for sqlexception drop table t5;
@@ -653,7 +625,7 @@ begin
 end|
 
 create table t5 (x int)|
---error 1051
+--error ER_BAD_TABLE_ERROR
 call bug3294()|
 drop procedure bug3294|
 
@@ -661,12 +633,6 @@ drop procedure bug3294|
 # BUG#876: Stored Procedures: Invalid SQLSTATE is allowed in 
 #          a DECLARE ? HANDLER FOR stmt.
 #
---disable_warnings
-drop procedure if exists bug8776_1|
-drop procedure if exists bug8776_2|
-drop procedure if exists bug8776_3|
-drop procedure if exists bug8776_4|
---enable_warnings
 --error ER_SP_BAD_SQLSTATE
 create procedure bug8776_1()
 begin
@@ -718,9 +684,6 @@ create procedure bug6600()
 # We should not think that mysql.proc table does not exist if we are unable
 # to open it under LOCK TABLE or in prelocked mode.
 #
---disable_warnings
-drop procedure if exists bug9566|
---enable_warnings
 create procedure bug9566()
 begin
   select * from t1;
@@ -739,9 +702,6 @@ drop procedure bug9566|
 #
 # BUG#7299: Stored procedures: exception handler catches not-found conditions
 #
---disable_warnings
-drop procedure if exists bug7299|
---enable_warnings
 create procedure bug7299()
 begin
   declare v int;
@@ -791,9 +751,6 @@ begin
 end|
 
 # This should still work.
---disable_warnings
-drop procedure if exists bug9073|
---enable_warnings
 create procedure bug9073()
 begin
   declare condname1 condition for sqlstate '42000';
@@ -848,11 +805,6 @@ begin
   return b;
 end|
 
---disable_warnings
-drop function if exists bug8408_f|
-drop procedure if exists bug8408_p|
---enable_warnings
-
 # Some things must be caught at invokation time
 create function bug8408_f() returns int
 begin
@@ -888,9 +840,6 @@ truncate table t1|
 # BUG#10537: Server crashes while loading data file into table through
 #            procedure.
 # Disable load until it's PS and SP safe
---disable_warnings
-drop procedure if exists bug10537|
---enable_warnings
 --error ER_SP_BADSTATEMENT
 create procedure bug10537()
   load data local infile '/tmp/somefile' into table t1|
@@ -899,9 +848,6 @@ create procedure bug10537()
 #
 # BUG#8409: Stored procedure crash if function contains FLUSH
 #
---disable_warnings
-drop function if exists bug8409|
---enable_warnings
 --error ER_STMT_NOT_ALLOWED_IN_SF_OR_TRG
 create function bug8409()
   returns int
@@ -961,9 +907,6 @@ create procedure bug9529_9012345678901234567890123456789012345678901234567890123
 begin
 end|
 
---disable_warnings
-drop procedure if exists bug17015_0123456789012345678901234567890123456789012345678901234|
---enable_warnings
 # Check the upper limit, just to make sure.
 create procedure bug17015_0123456789012345678901234567890123456789012345678901234()
 begin
@@ -977,9 +920,6 @@ drop procedure bug17015_0123456789012345678901234567890123456789012345678901234|
 #
 # BUG#10969: Stored procedures: crash if default() function
 #
---disable_warnings
-drop procedure if exists bug10969|
---enable_warnings
 --error ER_WRONG_COLUMN_NAME
 create procedure bug10969()
 begin
@@ -1032,7 +972,7 @@ P1: BEGIN
   SELECT 'end of proc';
 END P1|
 delimiter ;|
---error 1326
+--error ER_SP_CURSOR_NOT_OPEN
 call SP001();
 drop procedure SP001;
 drop table t1, t2;
@@ -1042,12 +982,6 @@ drop table t1, t2;
 # We have to disable recursion since in many cases LEX and many
 # Item's can't be used in reentrant way nowdays.
 delimiter |;
---disable_warnings
-drop function if exists bug11394|
-drop function if exists bug11394_1|
-drop function if exists bug11394_2|
-drop procedure if exists bug11394|
---enable_warnings
 create function bug11394(i int) returns int
 begin
   if i <= 0 then
@@ -1058,7 +992,7 @@ begin
 end|
 # If we allow recursive functions without additional modifications
 # this will crash server since Item for "IN" is not reenterable.
---error 1424
+--error ER_SP_NO_RECURSION
 select bug11394(2)|
 drop function bug11394|
 create function bug11394_1(i int) returns int
@@ -1071,7 +1005,7 @@ begin
 end|
 # The following statement will crash because some LEX members responsible
 # for selects cannot be used in reentrant fashion.
---error 1424
+--error ER_SP_NO_RECURSION
 select bug11394_1(2)|
 drop function bug11394_1|
 # Note that the following should be allowed since it does not contains
@@ -1111,10 +1045,6 @@ DROP TABLE t_bug_12490;
 # crashes server". Also tests handling of prepared stmts which use
 # stored functions but does not require prelocking.
 #
---disable_warnings
-drop function if exists bug11834_1;
-drop function if exists bug11834_2;
---enable_warnings
 create function bug11834_1() returns int return 10;
 create function bug11834_2() returns int return bug11834_1();
 prepare stmt from "select bug11834_2()";
@@ -1137,9 +1067,6 @@ drop function bug11834_2;
 # Bug#12953 "Stored procedures: crash if OPTIMIZE TABLE in function"
 #
 delimiter |;
---disable_warnings
-DROP FUNCTION IF EXISTS bug12953|
---enable_warnings
 --error ER_SP_NO_RETSET
 CREATE FUNCTION bug12953() RETURNS INT
 BEGIN
@@ -1152,9 +1079,6 @@ delimiter ;|
 # Bug##12995 "Inside function "Table 't4' was not locked with LOCK TABLES"
 #
 delimiter |;
---disable_warnings
-DROP FUNCTION IF EXISTS bug12995|
---enable_warnings
 --error ER_SP_BADSTATEMENT
 CREATE FUNCTION bug12995() RETURNS INT
 BEGIN
@@ -1173,7 +1097,7 @@ BEGIN
   HANDLER t1 CLOSE;
   RETURN 1;
 END|
---error 1305
+--error ER_SP_DOES_NOT_EXIST
 SELECT bug12995()|
 delimiter ;|
 
@@ -1181,10 +1105,6 @@ delimiter ;|
 #
 # BUG#12712: SET AUTOCOMMIT should fail within SP/functions/triggers
 #
---disable_warnings
-drop procedure if exists bug12712;
-drop function if exists bug12712;
---enable_warnings
 # Can...
 create procedure bug12712()
   set session autocommit = 0;
@@ -1238,9 +1158,6 @@ create trigger bug12712
 # BUG#9367: Stored procedures: client hang after "show warnings"
 #
 --disable_parsing
---disable_warnings
-drop procedure if exists bug9367;
---enable_warnings
 create table t1 (s1 int);
 select s1 from t1;
 delimiter |;
@@ -1263,13 +1180,6 @@ drop table t1;
 # BUG#13510: Setting password local variable changes current password
 #
 delimiter |;
---disable_warnings
-drop procedure if exists bug13510_1|
-drop procedure if exists bug13510_2|
-drop procedure if exists bug13510_3|
-drop procedure if exists bug13510_4|
---enable_warnings
-
 --error ER_SP_BAD_VAR_SHADOW
 create procedure bug13510_1()
 begin
@@ -1321,10 +1231,6 @@ drop procedure bug13510_4|
 # containing such statement should produce error (includes test for
 # bug #13627).
 #
---disable_warnings
-drop function if exists bug_13627_f|
---enable_warnings
-
 CREATE TABLE t1 (a int)|
 -- error ER_COMMIT_NOT_ALLOWED_IN_SF_OR_TRG
 CREATE TRIGGER tr1 BEFORE INSERT ON t1 FOR EACH ROW BEGIN DROP TRIGGER test1; END |
@@ -1505,12 +1411,6 @@ use test;
 # BUG#13037: undefined variable in IF cause erroneous error-message
 #
 
---disable_warnings
-DROP PROCEDURE IF EXISTS bug13037_p1;
-DROP PROCEDURE IF EXISTS bug13037_p2;
-DROP PROCEDURE IF EXISTS bug13037_p3;
---enable_warnings
-
 delimiter |;
 
 --error ER_SP_UNDECLARED_VAR
@@ -1535,14 +1435,14 @@ delimiter ;|
 
 --echo
 
---error 1054
+--error ER_BAD_FIELD_ERROR
 CALL bug13037_p2();
---error 1054
+--error ER_BAD_FIELD_ERROR
 CALL bug13037_p3();
 
---error 1054
+--error ER_BAD_FIELD_ERROR
 CALL bug13037_p2();
---error 1054
+--error ER_BAD_FIELD_ERROR
 CALL bug13037_p3();
 
 DROP PROCEDURE bug13037_p2;
@@ -1568,9 +1468,6 @@ use test;
 # Bug#13012 "SP: REPAIR/BACKUP/RESTORE TABLE crashes the server"
 #
 delimiter |;
---disable_warnings
-DROP FUNCTION IF EXISTS bug13012|
---enable_warnings
 --error ER_SP_NO_RETSET
 CREATE FUNCTION bug13012() RETURNS INT
 BEGIN
@@ -1602,11 +1499,6 @@ delimiter ;|
 # dropped simultaneously with table (DROP TABLE with CASCADE clause).
 # So these tests probably should go away once we will implement standard
 # behavior.
---disable_warnings
-drop function if exists bug11555_1;
-drop function if exists bug11555_2;
-drop view if exists v1, v2, v3, v4;
---enable_warnings
 create function bug11555_1() returns int return (select max(i) from t1);
 create function bug11555_2() returns int return bug11555_1();
 # It is OK to report name of implicitly used table which is missing
@@ -1660,10 +1552,6 @@ drop view v1;
 #
 # BUG#15658: Server crashes after creating function as empty string
 #
---disable_warnings
-drop procedure if exists ` bug15658`;
---enable_warnings
-
 --error ER_SP_WRONG_NAME
 create procedure ``() select 1;
 --error ER_SP_WRONG_NAME
@@ -1686,11 +1574,6 @@ drop procedure ` bug15658`;
 #
 # BUG#14270: Stored procedures: crash if load index
 #
---disable_warnings
-drop function if exists bug14270;
-drop table if exists t1;
---enable_warnings
-
 create table t1 (s1 int primary key);
 
 delimiter |;
@@ -1716,10 +1599,6 @@ drop table t1;
 # BUG#15091: Sp Returns Unknown error in order clause....and 
 #            there is no order by clause
 #
---disable_warnings
-drop procedure if exists bug15091;
---enable_warnings
-
 delimiter |;
 --error ER_SP_UNDECLARED_VAR
 create procedure bug15091()
@@ -1738,9 +1617,6 @@ delimiter ;|
 #
 # BUG#16896: Stored function: unused AGGREGATE-clause in CREATE FUNCTION
 #
---disable_warnings
-drop function if exists bug16896;
---enable_warnings
 
 --error ER_INVALID_AGGREGATE_FUNCTION
 create aggregate function bug16896() returns int return 1;
@@ -1753,10 +1629,6 @@ create aggregate function bug16896() returns int return 1;
 # Misleading error message was given when IF NOT EXISTS was used in
 # CREATE PROCEDURE.
 #
---disable_warnings
-DROP PROCEDURE IF EXISTS bug14702;
---enable_warnings
-
 --error ER_PARSE_ERROR
 CREATE IF NOT EXISTS PROCEDURE bug14702()
 BEGIN
@@ -1773,10 +1645,6 @@ DROP PROCEDURE IF EXISTS bug14702;
 #
 # See test case for what syntax is forbidden in a view.
 #
---disable_warnings
-DROP TABLE IF EXISTS t1;
---enable_warnings
-
 CREATE TABLE t1 (i INT);
 
 # We do not have to drop this procedure and view because they won't be
@@ -1811,10 +1679,6 @@ DROP TABLE t1;
 #
 # BUG#24491 "using alias from source table in insert ... on duplicate key"
 #
---disable_warnings
-drop tables if exists t1;
-drop procedure if exists bug24491;
---enable_warnings
 create table t1 (id int primary key auto_increment, value varchar(10));
 insert into t1 (id, value) values (1, 'FIRST'), (2, 'SECOND'), (3, 'THIRD');
 # Let us create routine with INSERT ... SELECT ... ON DUPLICATE KEY UPDATE 
@@ -1848,14 +1712,6 @@ drop tables t1;
 # DROP TABLE IF EXISTS is also fixed to give correct error instead of
 # "Table doesn't exist". 
 #
---disable_warnings
-DROP FUNCTION IF EXISTS bug18914_f1;
-DROP FUNCTION IF EXISTS bug18914_f2;
-DROP PROCEDURE IF EXISTS bug18914_p1;
-DROP PROCEDURE IF EXISTS bug18914_p2;
-DROP TABLE IF EXISTS t1, t2;
---enable_warnings
-
 CREATE TABLE t1 (i INT);
 
 CREATE PROCEDURE bug18914_p1() CREATE TABLE t2 (i INT);
@@ -1900,12 +1756,6 @@ DROP TABLE t1;
 # Bug#20713 (Functions will not not continue for SQLSTATE VALUE '42S02')
 #
 
---disable_warnings
-drop table if exists bogus_table_20713;
-drop function if exists func_20713_a;
-drop function if exists func_20713_b;
---enable_warnings
-
 create table bogus_table_20713( id int(10) not null primary key);
 insert into bogus_table_20713 values (1), (2), (3);
 
@@ -1964,14 +1814,6 @@ drop function if exists func_20713_b;
 # Bug#25345 (Cursors from Functions)
 #
 
---disable_warnings
-drop table if exists table_25345_a;
-drop table if exists table_25345_b;
-drop procedure if exists proc_25345;
-drop function if exists func_25345;
-drop function if exists func_25345_b;
---enable_warnings
-
 create table table_25345_a (a int);
 create table table_25345_b (b int);
 
@@ -2027,9 +1869,6 @@ drop function func_25345_b;
 # Bug#16164 "Easter egg": check that SHOW AUTHORS is disabled in
 # stored functions/triggers
 #
---disable_warnings
-drop function if exists bug16164;
---enable_warnings
 delimiter |;
 --error ER_SP_NO_RETSET
 create function bug16164() returns int
@@ -2043,9 +1882,6 @@ delimiter ;|
 #
 # BUG#20701: BINARY keyword should be forbidden in stored routines
 #
---disable_warnings
-drop function if exists bug20701;
---enable_warnings
 create function bug20701() returns varchar(25) binary return "test";
 drop function bug20701;
 create function bug20701() returns varchar(25) return "test";
@@ -2124,11 +1960,6 @@ delimiter ;//
 # Bug#28360 (RENAME DATABASE destroys routines)
 #
 
---disable_warnings
-drop procedure if exists proc_28360;
-drop function if exists func_28360;
---enable_warnings
-
 delimiter //;
 
 --error ER_SP_NO_DROP_SP
@@ -2151,9 +1982,6 @@ delimiter ;//
 # Bug#29223 declare cursor c for SHOW .....
 #
 
---disable_warnings
-DROP PROCEDURE IF EXISTS p1;
---enable_warnings
 --delimiter |
 --error ER_PARSE_ERROR
 CREATE PROCEDURE p1()
@@ -2172,9 +2000,6 @@ END|
 # Bug#29816 Syntactically wrong query fails with misleading error message
 #
 
---disable_warnings
-DROP DATABASE IF EXISTS mysqltest;
---enable_warnings
 CREATE DATABASE mysqltest;
 USE mysqltest;
 DROP DATABASE mysqltest;
@@ -2214,12 +2039,6 @@ delimiter ;|
 # Bug#30882 Dropping a temporary table inside a stored function may cause a server crash
 #
 
---disable_warnings
-drop function if exists f1;
-drop function if exists f2;
-drop table if exists t1, t2;
---enable_warnings
-
 delimiter |;
 create function f1() returns int
 begin
@@ -2284,13 +2103,6 @@ drop table t2;
 # Bug#33983 (Stored Procedures: wrong end <label> syntax is accepted)
 #
 
---disable_warnings
-drop procedure if exists proc_33983_a;
-drop procedure if exists proc_33983_b;
-drop procedure if exists proc_33983_c;
-drop procedure if exists proc_33983_d;
---enable_warnings
-
 delimiter |;
 
 --error ER_SP_LABEL_MISMATCH
@@ -2355,9 +2167,6 @@ delimiter ;|
 # Bug#21801: SQL exception handlers and warnings
 #
 
---disable_warnings
-drop procedure if exists p1;
---enable_warnings
 delimiter |;
 create procedure p1()
 begin
@@ -2373,10 +2182,6 @@ drop procedure p1;
 # Bug#8759 (Stored Procedures: SQLSTATE '00000' should be illegal)
 #
 
---disable_warnings
-drop procedure if exists proc_8759;
---enable_warnings
-
 delimiter $$;
 
 --error ER_SP_BAD_SQLSTATE
@@ -2398,10 +2203,6 @@ delimiter ;$$
 # Bug#36510 (Stored Procedures: mysql_error_code 0 should be illegal)
 #
 
---disable_warnings
-drop procedure if exists proc_36510;
---enable_warnings
-
 delimiter $$;
 
 --error ER_SP_BAD_SQLSTATE
@@ -2435,9 +2236,6 @@ delimiter ;$$
 # Bug#15192: "fatal errors" are caught by handlers in stored procedures
 #
 
---disable_warnings
-drop procedure if exists p1;
---enable_warnings
 set @old_recursion_depth = @@max_sp_recursion_depth;
 set @@max_sp_recursion_depth = 255;
 delimiter |;
@@ -2456,10 +2254,6 @@ drop procedure p1;
 #
 # BUG#NNNN: New bug synopsis
 #
-#--disable_warnings
-#drop procedure if exists bugNNNN;
-#drop function if exists bugNNNN;
-#--enable_warnings
 #create procedure bugNNNN...
 #create function bugNNNN...
 
@@ -2500,9 +2294,9 @@ END|
 delimiter ;|
 
 # The bug caused the following INSERT statement to trigger
-# an assertion.   Error 1442 is the correct response
+# an assertion.   Error ER_CANT_UPDATE_USED_TABLE_IN_SF_OR_TRG is the correct response
 #
---error 1442
+--error ER_CANT_UPDATE_USED_TABLE_IN_SF_OR_TRG
 INSERT INTO t1 SELECT * FROM (SELECT 2 AS f1, 2 AS f2) AS A WHERE func_1() = 5;
 
 # Cleanup
@@ -2565,15 +2359,6 @@ CALL db_name.very_long_pr_name_1111111111111111111111111111111111111111111111111
 --echo # - Case 1
 --echo
 
---disable_warnings
-DROP PROCEDURE IF EXISTS p1;
-DROP PROCEDURE IF EXISTS p2;
-DROP PROCEDURE IF EXISTS p3;
-DROP PROCEDURE IF EXISTS p4;
-DROP PROCEDURE IF EXISTS p5;
-DROP PROCEDURE IF EXISTS p6;
---enable_warnings
-
 delimiter |;
 
 CREATE PROCEDURE p1()
@@ -2660,10 +2445,6 @@ DROP PROCEDURE p6;
 --echo # - Case 3: check that "Exception trumps No Data".
 --echo
 
---disable_warnings
-DROP TABLE IF EXISTS t1;
---enable_warnings
-
 CREATE TABLE t1(a INT);
 INSERT INTO t1 VALUES (1), (2), (3);
 
@@ -2706,11 +2487,6 @@ DROP TABLE t1;
 --echo # Bug#36185: Incorrect precedence for warning and exception handlers
 --echo #
 
---disable_warnings
-DROP TABLE IF EXISTS t1;
-DROP PROCEDURE IF EXISTS p1;
---enable_warnings
-
 CREATE TABLE t1 (a INT, b INT NOT NULL);
 
 delimiter |;
@@ -2799,12 +2575,6 @@ SET sql_mode = @sql_mode_saved;
 --echo # Bug#55850: Trigger warnings not cleared.
 --echo #
 
---disable_warnings
-DROP TABLE IF EXISTS t1;
-DROP TABLE IF EXISTS t2;
-DROP PROCEDURE IF EXISTS p1;
---enable_warnings
-
 CREATE TABLE t1(x SMALLINT, y SMALLINT, z SMALLINT);
 CREATE TABLE t2(a SMALLINT, b SMALLINT, c SMALLINT,
                 d SMALLINT, e SMALLINT, f SMALLINT);
@@ -3474,10 +3244,6 @@ DROP PROCEDURE p13;
 --echo
 
 --disable_ps2_protocol
---disable_warnings
-DROP FUNCTION IF EXISTS f1;
-DROP TABLE IF EXISTS t1;
---enable_warnings
 
 CREATE TABLE t1(msg VARCHAR(255));
 
@@ -3529,16 +3295,6 @@ DROP TABLE t1;
 --echo # Check that handled SQL-conditions are properly cleared from DA.
 --echo
 
---disable_warnings
-DROP TABLE IF EXISTS t1;
-DROP TABLE IF EXISTS t2;
-DROP PROCEDURE IF EXISTS p1;
-DROP PROCEDURE IF EXISTS p2;
-DROP PROCEDURE IF EXISTS p3;
-DROP PROCEDURE IF EXISTS p4;
-DROP PROCEDURE IF EXISTS p5;
---enable_warnings
-
 CREATE TABLE t1(a CHAR, b CHAR, c CHAR);
 CREATE TABLE t2(a SMALLINT, b SMALLINT, c SMALLINT);
 
@@ -3717,11 +3473,6 @@ DROP TABLE t2;
 --echo # are declared.
 --echo
 
---disable_warnings
-DROP PROCEDURE IF EXISTS p1;
-DROP PROCEDURE IF EXISTS p2;
---enable_warnings
-
 delimiter |;
 
 SET sql_mode = ''|
@@ -3756,11 +3507,6 @@ DROP PROCEDURE p2;
 --echo # Bug#13113222 RQG_SIGNAL_RESIGNAL FAILED WITH ASSERTION.
 --echo #
 
---disable_warnings
-DROP PROCEDURE IF EXISTS p1;
-DROP PROCEDURE IF EXISTS p2;
---enable_warnings
-
 delimiter |;
 CREATE PROCEDURE p1()
 BEGIN
@@ -3791,12 +3537,6 @@ DROP PROCEDURE p2;
 --echo # from internal stored function.
 --echo
 
---disable_warnings
-DROP FUNCTION IF EXISTS f1;
-DROP FUNCTION IF EXISTS f2;
-DROP TABLE IF EXISTS t1;
---enable_warnings
-
 --echo
 
 CREATE TABLE t1 (a INT, b INT);
diff --git a/mysql-test/main/sp.result b/mysql-test/main/sp.result
index 9efd098fd9c..20152586ee4 100644
--- a/mysql-test/main/sp.result
+++ b/mysql-test/main/sp.result
@@ -4448,7 +4448,7 @@ begin
 update t3 set id=2, county=value(c);
 end|
 call bug15441('county')|
-ERROR 42S22: Unknown column 'c' in 'field list'
+ERROR 42S22: Unknown column 'c' in 'SET'
 drop procedure bug15441|
 create procedure bug15441(county varchar(25))
 begin
@@ -6940,9 +6940,9 @@ BEGIN
 SELECT a FROM t1 A WHERE A.b IN (SELECT b FROM t2 AS B);
 END|
 CALL p1;
-ERROR 42S22: Unknown column 'A.b' in 'IN/ALL/ANY subquery'
+ERROR 42S22: Unknown column 'A.b' in 'IN/ALL/ANY'
 CALL p1;
-ERROR 42S22: Unknown column 'A.b' in 'IN/ALL/ANY subquery'
+ERROR 42S22: Unknown column 'A.b' in 'IN/ALL/ANY'
 DROP PROCEDURE p1;
 DROP TABLE t1, t2;
 #
@@ -7251,7 +7251,7 @@ insert into t1 (a) values (1), (2), (3), (4), (5);
 # we drop and re-create the procedure.
 #
 call p1();
-ERROR 42S22: Unknown column 'test.t1.c1' in 'field list'
+ERROR 42S22: Unknown column 'test.t1.c1' in 'SELECT'
 # 
 # Drop and recreate the procedure, then repeat
 #
@@ -7915,11 +7915,11 @@ drop table t1,t2;
 CREATE TABLE t1 (a INT, b VARCHAR(32));
 CREATE PROCEDURE sp() SELECT * FROM t1 AS t1x JOIN t1 AS t1y USING (c);
 CALL sp;
-ERROR 42S22: Unknown column 'c' in 'from clause'
+ERROR 42S22: Unknown column 'c' in 'FROM'
 CALL sp;
-ERROR 42S22: Unknown column 'c' in 'from clause'
+ERROR 42S22: Unknown column 'c' in 'FROM'
 CALL sp;
-ERROR 42S22: Unknown column 'c' in 'from clause'
+ERROR 42S22: Unknown column 'c' in 'FROM'
 alter table t1 add column c int;
 CALL sp;
 c	a	b	a	b
@@ -7938,11 +7938,11 @@ CALL sp;
 ERROR HY000: Table 'v1' was not locked with LOCK TABLES
 UNLOCK TABLES;
 CALL sp;
-ERROR 42S22: Unknown column 'b' in 'order clause'
+ERROR 42S22: Unknown column 'b' in 'ORDER BY'
 CALL sp;
-ERROR 42S22: Unknown column 'b' in 'order clause'
+ERROR 42S22: Unknown column 'b' in 'ORDER BY'
 CALL sp;
-ERROR 42S22: Unknown column 'b' in 'order clause'
+ERROR 42S22: Unknown column 'b' in 'ORDER BY'
 DROP PROCEDURE sp;
 CREATE PROCEDURE sp() UPDATE v1 SET a = 1 WHERE a=1 and b=2;
 LOCK TABLE t2 READ;
@@ -7950,11 +7950,11 @@ CALL sp;
 ERROR HY000: Table 'v1' was not locked with LOCK TABLES
 UNLOCK TABLES;
 CALL sp;
-ERROR 42S22: Unknown column 'b' in 'where clause'
+ERROR 42S22: Unknown column 'b' in 'WHERE'
 CALL sp;
-ERROR 42S22: Unknown column 'b' in 'where clause'
+ERROR 42S22: Unknown column 'b' in 'WHERE'
 CALL sp;
-ERROR 42S22: Unknown column 'b' in 'where clause'
+ERROR 42S22: Unknown column 'b' in 'WHERE'
 DROP PROCEDURE sp;
 DROP VIEW v1;
 DROP TABLE t1, t2;
@@ -8386,7 +8386,7 @@ DROP PROCEDURE p1;
 #
 CREATE OR REPLACE PROCEDURE p1 (a VARCHAR(10)) SELECT 1;
 CALL p1(a);
-ERROR 42S22: Unknown column 'a' in 'field list'
+ERROR 42S22: Unknown column 'a' in 'CALL'
 drop procedure p1;
 CREATE OR REPLACE PROCEDURE p1 (a VARCHAR(10)) SELECT a|
 CREATE OR REPLACE PROCEDURE p2 ()
diff --git a/mysql-test/main/ssl.result b/mysql-test/main/ssl.result
index 4f8ce517330..8d209fb3808 100644
--- a/mysql-test/main/ssl.result
+++ b/mysql-test/main/ssl.result
@@ -2183,7 +2183,7 @@ SELECT ELT(FIELD(kundentyp,'PP','PPA','PG','PGA','FK','FKA','FP','FPA','K','KA',
 Kundentyp	kategorie
 Privat (Private Nutzung)	Mobilfunk
 Warnings:
-Warning	1052	Column 'kundentyp' in group statement is ambiguous
+Warning	1052	Column 'kundentyp' in GROUP BY is ambiguous
 drop table t1;
 SELECT (VARIABLE_VALUE <> '') AS have_ssl FROM INFORMATION_SCHEMA.SESSION_STATUS WHERE VARIABLE_NAME='Ssl_cipher';
 have_ssl
diff --git a/mysql-test/main/ssl_compress.result b/mysql-test/main/ssl_compress.result
index 69de425cdc1..7859157828f 100644
--- a/mysql-test/main/ssl_compress.result
+++ b/mysql-test/main/ssl_compress.result
@@ -2162,7 +2162,7 @@ SELECT ELT(FIELD(kundentyp,'PP','PPA','PG','PGA','FK','FKA','FP','FPA','K','KA',
 Kundentyp	kategorie
 Privat (Private Nutzung)	Mobilfunk
 Warnings:
-Warning	1052	Column 'kundentyp' in group statement is ambiguous
+Warning	1052	Column 'kundentyp' in GROUP BY is ambiguous
 drop table t1;
 SELECT (VARIABLE_VALUE <> '') AS have_ssl FROM INFORMATION_SCHEMA.SESSION_STATUS WHERE VARIABLE_NAME='Ssl_cipher';
 have_ssl
diff --git a/mysql-test/main/subselect.result b/mysql-test/main/subselect.result
index 9fbf36e3d6e..e93cbbd3625 100644
--- a/mysql-test/main/subselect.result
+++ b/mysql-test/main/subselect.result
@@ -63,12 +63,12 @@ SELECT 1 FROM (SELECT 1 as a) as b HAVING (SELECT a)=1;
 1
 1
 SELECT (SELECT 1), a;
-ERROR 42S22: Unknown column 'a' in 'field list'
+ERROR 42S22: Unknown column 'a' in 'SELECT'
 SELECT 1 as a FROM (SELECT 1) as b HAVING (SELECT a)=1;
 a
 1
 SELECT 1 FROM (SELECT (SELECT a) b) c;
-ERROR 42S22: Unknown column 'a' in 'field list'
+ERROR 42S22: Unknown column 'a' in 'SELECT'
 SELECT * FROM (SELECT 1 as id) b WHERE id IN (SELECT * FROM (SELECT 1 as id) c ORDER BY id);
 id
 1
@@ -85,9 +85,9 @@ ERROR 42000: You have an error in your SQL syntax; check the manual that corresp
 SELECT 1 FROM (SELECT 1) a PROCEDURE ANALYSE((SELECT 1));
 ERROR 42000: PROCEDURE does not support subqueries or stored functions
 SELECT (SELECT 1) as a FROM (SELECT 1) b WHERE (SELECT a) IS NULL;
-ERROR 42S22: Unknown column 'a' in 'field list'
+ERROR 42S22: Unknown column 'a' in 'SELECT'
 SELECT (SELECT 1) as a FROM (SELECT 1) b WHERE (SELECT a) IS NOT NULL;
-ERROR 42S22: Unknown column 'a' in 'field list'
+ERROR 42S22: Unknown column 'a' in 'SELECT'
 SELECT (SELECT 1,2,3) = ROW(1,2,3);
 (SELECT 1,2,3) = ROW(1,2,3)
 1
@@ -370,7 +370,7 @@ Warnings:
 Note	1276	Field or reference 'test.t6.clinic_uq' of SELECT #2 was resolved in SELECT #1
 Note	1003	select `test`.`t6`.`patient_uq` AS `patient_uq`,`test`.`t6`.`clinic_uq` AS `clinic_uq` from `test`.`t7` join `test`.`t6` where `test`.`t6`.`clinic_uq` = `test`.`t7`.`uq`
 select * from t1 where a= (select a from t2,t4 where t2.b=t4.b);
-ERROR 23000: Column 'a' in field list is ambiguous
+ERROR 23000: Column 'a' in SELECT is ambiguous
 drop table t1,t2,t3;
 CREATE TABLE t3 (a varchar(20),b char(1) NOT NULL default '0');
 INSERT INTO t3 VALUES ('W','a'),('A','c'),('J','b');
@@ -481,9 +481,9 @@ numeropost	maxnumrep
 43506	2
 40143	1
 SELECT (SELECT 1) as a FROM (SELECT 1 FROM t1 HAVING a=1) b;
-ERROR 42S22: Unknown column 'a' in 'having clause'
+ERROR 42S22: Unknown column 'a' in 'HAVING'
 SELECT 1 IN (SELECT 1 FROM t2 HAVING a);
-ERROR 42S22: Unknown column 'a' in 'having clause'
+ERROR 42S22: Unknown column 'a' in 'HAVING'
 SELECT * from t2 where topic IN (SELECT topic FROM t2 GROUP BY topic);
 mot	topic	date	pseudo
 joce	40143	2002-10-22	joce
@@ -576,7 +576,7 @@ KEY `pseudo` (`pseudo`,`numeropost`)
 SELECT (SELECT numeropost FROM t1 HAVING numreponse=a),numreponse FROM (SELECT * FROM t1) as a;
 ERROR 42S22: Reference 'numreponse' not supported (forward reference in item list)
 SELECT numreponse, (SELECT numeropost FROM t1 HAVING numreponse=a) FROM (SELECT * FROM t1) as a;
-ERROR 42S22: Unknown column 'a' in 'having clause'
+ERROR 42S22: Unknown column 'a' in 'HAVING'
 SELECT numreponse, (SELECT numeropost FROM t1 HAVING numreponse=1) FROM (SELECT * FROM t1) as a;
 numreponse	(SELECT numeropost FROM t1 HAVING numreponse=1)
 INSERT INTO t1 (numeropost,numreponse,pseudo) VALUES (1,1,'joce'),(1,2,'joce'),(1,3,'test');
@@ -1404,7 +1404,7 @@ INSERT INTO t1 VALUES (1);
 UPDATE t1 SET i=i+(SELECT MAX(i) FROM (SELECT 1) t) WHERE i=(SELECT MAX(i));
 UPDATE t1 SET i=i+1 WHERE i=(SELECT MAX(i));
 UPDATE t1 SET t.i=i+(SELECT MAX(i) FROM (SELECT 1) t);
-ERROR 42S22: Unknown column 't.i' in 'field list'
+ERROR 42S22: Unknown column 't.i' in 'SET'
 select * from t1;
 i
 3
@@ -1608,7 +1608,7 @@ create table t2 (s1 int);
 insert into t1 values (1);
 insert into t2 values (1);
 update t1 set  s1 = s1 + 1 where 1 = (select x.s1 as A from t2 WHERE t2.s1 > t1.s1 order by A);
-ERROR 42S22: Unknown column 'x.s1' in 'field list'
+ERROR 42S22: Unknown column 'x.s1' in 'SELECT'
 DROP TABLE t1, t2;
 CREATE TABLE t1 (s1 CHAR(5) COLLATE latin1_german1_ci,
 s2 CHAR(5) COLLATE latin1_swedish_ci);
@@ -1842,11 +1842,11 @@ drop table t1, t2;
 create table t1 (s1 int);
 create table t2 (s1 int);
 select * from t1 where (select count(*) from t2 where t1.s2) = 1;
-ERROR 42S22: Unknown column 't1.s2' in 'where clause'
+ERROR 42S22: Unknown column 't1.s2' in 'WHERE'
 select * from t1 where (select count(*) from t2 group by t1.s2) = 1;
-ERROR 42S22: Unknown column 't1.s2' in 'group statement'
+ERROR 42S22: Unknown column 't1.s2' in 'GROUP BY'
 select count(*) from t2 group by t1.s2;
-ERROR 42S22: Unknown column 't1.s2' in 'group statement'
+ERROR 42S22: Unknown column 't1.s2' in 'GROUP BY'
 drop table t1, t2;
 CREATE TABLE t1(COLA FLOAT NOT NULL,COLB FLOAT NOT NULL,COLC VARCHAR(20) DEFAULT NULL,PRIMARY KEY (COLA, COLB));
 CREATE TABLE t2(COLA FLOAT NOT NULL,COLB FLOAT NOT NULL,COLC CHAR(1) NOT NULL,PRIMARY KEY (COLA));
@@ -2649,7 +2649,7 @@ INSERT INTO `t1` VALUES (1,0,0,700),(1,1,1,400),(1,5,5,400),(1,12,12,400),(1,12,
 CREATE TABLE `t2` ( `id` int(10) unsigned NOT NULL default '0', `pid` int(10) unsigned NOT NULL default '0', `map` smallint(6) unsigned NOT NULL default '0', `level` tinyint(4) unsigned NOT NULL default '0', `title` varchar(255) default NULL, PRIMARY KEY  (`id`,`pid`,`map`), KEY `level` (`level`), KEY `id` (`id`,`map`)) ;
 INSERT INTO `t2` VALUES (6,5,12,7,'a'),(12,0,0,7,'a'),(12,1,0,7,'a'),(12,5,5,7,'a'),(12,5,12,7,'a');
 SELECT b.sc FROM (SELECT (SELECT a.access FROM t1 a WHERE a.map = op.map AND a.slave = op.pid AND a.master = 1) ac FROM t2 op WHERE op.id = 12 AND op.map = 0) b;
-ERROR 42S22: Unknown column 'b.sc' in 'field list'
+ERROR 42S22: Unknown column 'b.sc' in 'SELECT'
 SELECT b.ac FROM (SELECT (SELECT a.access FROM t1 a WHERE a.map = op.map AND a.slave = op.pid AND a.master = 1) ac FROM t2 op WHERE op.id = 12 AND op.map = 0) b;
 ac
 700
@@ -2740,7 +2740,7 @@ drop table t1;
 create table t1 (a1 int);
 create table t2 (b1 int);
 select * from t1 where a2 > any(select b1 from t2);
-ERROR 42S22: Unknown column 'a2' in 'IN/ALL/ANY subquery'
+ERROR 42S22: Unknown column 'a2' in 'IN/ALL/ANY'
 select * from t1 where a1 > any(select b1 from t2);
 a1
 drop table t1,t2;
@@ -3665,11 +3665,11 @@ delete from t1 where c <= 1140006215 and (select b from t2 where a = 2) = 1;
 drop table t1, t2;
 CREATE TABLE t1 (a INT);
 CREATE VIEW v1 AS SELECT * FROM t1 WHERE no_such_column = ANY (SELECT 1);
-ERROR 42S22: Unknown column 'no_such_column' in 'IN/ALL/ANY subquery'
+ERROR 42S22: Unknown column 'no_such_column' in 'IN/ALL/ANY'
 CREATE VIEW v2 AS SELECT * FROM t1 WHERE no_such_column = (SELECT 1);
-ERROR 42S22: Unknown column 'no_such_column' in 'where clause'
+ERROR 42S22: Unknown column 'no_such_column' in 'WHERE'
 SELECT * FROM t1 WHERE no_such_column = ANY (SELECT 1);
-ERROR 42S22: Unknown column 'no_such_column' in 'IN/ALL/ANY subquery'
+ERROR 42S22: Unknown column 'no_such_column' in 'IN/ALL/ANY'
 DROP TABLE t1;
 create table t1 (i int, j bigint);
 insert into t1 values (1, 2), (2, 2), (3, 2);
@@ -4471,11 +4471,11 @@ EXPLAIN
 SELECT a AS out_a, MIN(b) FROM t1
 WHERE b > (SELECT MIN(b) FROM t1 WHERE a = out_a)
 GROUP BY a;
-ERROR 42S22: Unknown column 'out_a' in 'where clause'
+ERROR 42S22: Unknown column 'out_a' in 'WHERE'
 SELECT a AS out_a, MIN(b) FROM t1
 WHERE b > (SELECT MIN(b) FROM t1 WHERE a = out_a)
 GROUP BY a;
-ERROR 42S22: Unknown column 'out_a' in 'where clause'
+ERROR 42S22: Unknown column 'out_a' in 'WHERE'
 EXPLAIN
 SELECT a AS out_a, MIN(b) FROM t1 t1_outer
 WHERE b > (SELECT MIN(b) FROM t1 WHERE a = t1_outer.a)
@@ -5464,7 +5464,7 @@ INSERT INTO t1 VALUES (repeat('b',@@global.max_allowed_packet));
 EXPLAIN EXTENDED SELECT DISTINCT 1 FROM t1,
 (SELECT DISTINCTROW a AS away FROM t1 GROUP BY a WITH ROLLUP) AS d1  
 WHERE t1.a = d1.a;
-ERROR 42S22: Unknown column 'd1.a' in 'where clause'
+ERROR 42S22: Unknown column 'd1.a' in 'WHERE'
 DROP TABLE t1;
 Set up test tables.
 CREATE TABLE t1 (
diff --git a/mysql-test/main/subselect3.result b/mysql-test/main/subselect3.result
index 9b9193aa429..c769d5ad2e6 100644
--- a/mysql-test/main/subselect3.result
+++ b/mysql-test/main/subselect3.result
@@ -886,13 +886,13 @@ SELECT c FROM
 (SELECT COUNT(b) FROM t1) AS x GROUP BY c
 ) FROM t1 GROUP BY b
 ) AS y;
-ERROR 42S22: Unknown column 'c' in 'field list'
+ERROR 42S22: Unknown column 'c' in 'SELECT'
 SHOW WARNINGS;
 Level	Code	Message
 Note	1276	Field or reference 'test.t1.a' of SELECT #3 was resolved in SELECT #2
 Note	1981	Aggregate function 'count()' of SELECT #3 belongs to SELECT #2
 Note	1276	Field or reference 'test.t1.c' of SELECT #3 was resolved in SELECT #2
-Error	1054	Unknown column 'c' in 'field list'
+Error	1054	Unknown column 'c' in 'SELECT'
 DROP TABLE t1;
 End of 5.0 tests
 #  
@@ -1443,7 +1443,7 @@ CALL p1;
 f1
 ALTER TABLE t2 CHANGE COLUMN f1 my_column INT;
 CALL p1;
-ERROR 42S22: Unknown column 'f1' in 'where clause'
+ERROR 42S22: Unknown column 'f1' in 'WHERE'
 DROP PROCEDURE p1;
 DROP TABLE t1, t2;
 #
diff --git a/mysql-test/main/subselect3_jcl6.result b/mysql-test/main/subselect3_jcl6.result
index 5d326674bd7..21974170e23 100644
--- a/mysql-test/main/subselect3_jcl6.result
+++ b/mysql-test/main/subselect3_jcl6.result
@@ -889,13 +889,13 @@ SELECT c FROM
 (SELECT COUNT(b) FROM t1) AS x GROUP BY c
 ) FROM t1 GROUP BY b
 ) AS y;
-ERROR 42S22: Unknown column 'c' in 'field list'
+ERROR 42S22: Unknown column 'c' in 'SELECT'
 SHOW WARNINGS;
 Level	Code	Message
 Note	1276	Field or reference 'test.t1.a' of SELECT #3 was resolved in SELECT #2
 Note	1981	Aggregate function 'count()' of SELECT #3 belongs to SELECT #2
 Note	1276	Field or reference 'test.t1.c' of SELECT #3 was resolved in SELECT #2
-Error	1054	Unknown column 'c' in 'field list'
+Error	1054	Unknown column 'c' in 'SELECT'
 DROP TABLE t1;
 End of 5.0 tests
 #  
@@ -1446,7 +1446,7 @@ CALL p1;
 f1
 ALTER TABLE t2 CHANGE COLUMN f1 my_column INT;
 CALL p1;
-ERROR 42S22: Unknown column 'f1' in 'where clause'
+ERROR 42S22: Unknown column 'f1' in 'WHERE'
 DROP PROCEDURE p1;
 DROP TABLE t1, t2;
 #
diff --git a/mysql-test/main/subselect4.result b/mysql-test/main/subselect4.result
index b988dd0659a..c9ce1a33a4e 100644
--- a/mysql-test/main/subselect4.result
+++ b/mysql-test/main/subselect4.result
@@ -2696,7 +2696,7 @@ DROP TABLE t1, t2;
 CREATE TABLE t1(a INT, b INT);
 INSERT INTO t1 VALUES (1,1), (2,2), (3,3), (4,4), (5,5);
 SELECT a, b FROM t1 WHERE a IN (SELECT A.a FROM t1 A GROUP BY s.id);
-ERROR 42S22: Unknown column 's.id' in 'group statement'
+ERROR 42S22: Unknown column 's.id' in 'GROUP BY'
 DROP TABLE t1;
 #
 # MDEV-24519: Server crashes in Charset::set_charset upon SELECT
diff --git a/mysql-test/main/subselect_exists2in.result b/mysql-test/main/subselect_exists2in.result
index 9c2246b36ea..a2fe68acd63 100644
--- a/mysql-test/main/subselect_exists2in.result
+++ b/mysql-test/main/subselect_exists2in.result
@@ -5,7 +5,7 @@ set optimizer_switch='exists_to_in=on';
 #
 CREATE TABLE t1 (f1 integer);
 SELECT * FROM t1 WHERE EXISTS (SELECT NO_SUCH_TABLE.NO_SUCH_FIELD FROM t1);
-ERROR 42S22: Unknown column 'NO_SUCH_TABLE.NO_SUCH_FIELD' in 'field list'
+ERROR 42S22: Unknown column 'NO_SUCH_TABLE.NO_SUCH_FIELD' in 'SELECT'
 drop table t1;
 #
 # LP BUG#884657 Wrong result with exists2in , correlated subquery
diff --git a/mysql-test/main/subselect_no_exists_to_in.result b/mysql-test/main/subselect_no_exists_to_in.result
index 0fdd573b339..a848cf53d78 100644
--- a/mysql-test/main/subselect_no_exists_to_in.result
+++ b/mysql-test/main/subselect_no_exists_to_in.result
@@ -67,12 +67,12 @@ SELECT 1 FROM (SELECT 1 as a) as b HAVING (SELECT a)=1;
 1
 1
 SELECT (SELECT 1), a;
-ERROR 42S22: Unknown column 'a' in 'field list'
+ERROR 42S22: Unknown column 'a' in 'SELECT'
 SELECT 1 as a FROM (SELECT 1) as b HAVING (SELECT a)=1;
 a
 1
 SELECT 1 FROM (SELECT (SELECT a) b) c;
-ERROR 42S22: Unknown column 'a' in 'field list'
+ERROR 42S22: Unknown column 'a' in 'SELECT'
 SELECT * FROM (SELECT 1 as id) b WHERE id IN (SELECT * FROM (SELECT 1 as id) c ORDER BY id);
 id
 1
@@ -89,9 +89,9 @@ ERROR 42000: You have an error in your SQL syntax; check the manual that corresp
 SELECT 1 FROM (SELECT 1) a PROCEDURE ANALYSE((SELECT 1));
 ERROR 42000: PROCEDURE does not support subqueries or stored functions
 SELECT (SELECT 1) as a FROM (SELECT 1) b WHERE (SELECT a) IS NULL;
-ERROR 42S22: Unknown column 'a' in 'field list'
+ERROR 42S22: Unknown column 'a' in 'SELECT'
 SELECT (SELECT 1) as a FROM (SELECT 1) b WHERE (SELECT a) IS NOT NULL;
-ERROR 42S22: Unknown column 'a' in 'field list'
+ERROR 42S22: Unknown column 'a' in 'SELECT'
 SELECT (SELECT 1,2,3) = ROW(1,2,3);
 (SELECT 1,2,3) = ROW(1,2,3)
 1
@@ -374,7 +374,7 @@ Warnings:
 Note	1276	Field or reference 'test.t6.clinic_uq' of SELECT #2 was resolved in SELECT #1
 Note	1003	/* select#1 */ select `test`.`t6`.`patient_uq` AS `patient_uq`,`test`.`t6`.`clinic_uq` AS `clinic_uq` from `test`.`t6` where <expr_cache><`test`.`t6`.`clinic_uq`>(exists(/* select#2 */ select 1 from `test`.`t7` where `test`.`t7`.`uq` = `test`.`t6`.`clinic_uq` limit 1))
 select * from t1 where a= (select a from t2,t4 where t2.b=t4.b);
-ERROR 23000: Column 'a' in field list is ambiguous
+ERROR 23000: Column 'a' in SELECT is ambiguous
 drop table t1,t2,t3;
 CREATE TABLE t3 (a varchar(20),b char(1) NOT NULL default '0');
 INSERT INTO t3 VALUES ('W','a'),('A','c'),('J','b');
@@ -485,9 +485,9 @@ numeropost	maxnumrep
 43506	2
 40143	1
 SELECT (SELECT 1) as a FROM (SELECT 1 FROM t1 HAVING a=1) b;
-ERROR 42S22: Unknown column 'a' in 'having clause'
+ERROR 42S22: Unknown column 'a' in 'HAVING'
 SELECT 1 IN (SELECT 1 FROM t2 HAVING a);
-ERROR 42S22: Unknown column 'a' in 'having clause'
+ERROR 42S22: Unknown column 'a' in 'HAVING'
 SELECT * from t2 where topic IN (SELECT topic FROM t2 GROUP BY topic);
 mot	topic	date	pseudo
 joce	40143	2002-10-22	joce
@@ -580,7 +580,7 @@ KEY `pseudo` (`pseudo`,`numeropost`)
 SELECT (SELECT numeropost FROM t1 HAVING numreponse=a),numreponse FROM (SELECT * FROM t1) as a;
 ERROR 42S22: Reference 'numreponse' not supported (forward reference in item list)
 SELECT numreponse, (SELECT numeropost FROM t1 HAVING numreponse=a) FROM (SELECT * FROM t1) as a;
-ERROR 42S22: Unknown column 'a' in 'having clause'
+ERROR 42S22: Unknown column 'a' in 'HAVING'
 SELECT numreponse, (SELECT numeropost FROM t1 HAVING numreponse=1) FROM (SELECT * FROM t1) as a;
 numreponse	(SELECT numeropost FROM t1 HAVING numreponse=1)
 INSERT INTO t1 (numeropost,numreponse,pseudo) VALUES (1,1,'joce'),(1,2,'joce'),(1,3,'test');
@@ -1408,7 +1408,7 @@ INSERT INTO t1 VALUES (1);
 UPDATE t1 SET i=i+(SELECT MAX(i) FROM (SELECT 1) t) WHERE i=(SELECT MAX(i));
 UPDATE t1 SET i=i+1 WHERE i=(SELECT MAX(i));
 UPDATE t1 SET t.i=i+(SELECT MAX(i) FROM (SELECT 1) t);
-ERROR 42S22: Unknown column 't.i' in 'field list'
+ERROR 42S22: Unknown column 't.i' in 'SET'
 select * from t1;
 i
 3
@@ -1612,7 +1612,7 @@ create table t2 (s1 int);
 insert into t1 values (1);
 insert into t2 values (1);
 update t1 set  s1 = s1 + 1 where 1 = (select x.s1 as A from t2 WHERE t2.s1 > t1.s1 order by A);
-ERROR 42S22: Unknown column 'x.s1' in 'field list'
+ERROR 42S22: Unknown column 'x.s1' in 'SELECT'
 DROP TABLE t1, t2;
 CREATE TABLE t1 (s1 CHAR(5) COLLATE latin1_german1_ci,
 s2 CHAR(5) COLLATE latin1_swedish_ci);
@@ -1846,11 +1846,11 @@ drop table t1, t2;
 create table t1 (s1 int);
 create table t2 (s1 int);
 select * from t1 where (select count(*) from t2 where t1.s2) = 1;
-ERROR 42S22: Unknown column 't1.s2' in 'where clause'
+ERROR 42S22: Unknown column 't1.s2' in 'WHERE'
 select * from t1 where (select count(*) from t2 group by t1.s2) = 1;
-ERROR 42S22: Unknown column 't1.s2' in 'group statement'
+ERROR 42S22: Unknown column 't1.s2' in 'GROUP BY'
 select count(*) from t2 group by t1.s2;
-ERROR 42S22: Unknown column 't1.s2' in 'group statement'
+ERROR 42S22: Unknown column 't1.s2' in 'GROUP BY'
 drop table t1, t2;
 CREATE TABLE t1(COLA FLOAT NOT NULL,COLB FLOAT NOT NULL,COLC VARCHAR(20) DEFAULT NULL,PRIMARY KEY (COLA, COLB));
 CREATE TABLE t2(COLA FLOAT NOT NULL,COLB FLOAT NOT NULL,COLC CHAR(1) NOT NULL,PRIMARY KEY (COLA));
@@ -2652,7 +2652,7 @@ INSERT INTO `t1` VALUES (1,0,0,700),(1,1,1,400),(1,5,5,400),(1,12,12,400),(1,12,
 CREATE TABLE `t2` ( `id` int(10) unsigned NOT NULL default '0', `pid` int(10) unsigned NOT NULL default '0', `map` smallint(6) unsigned NOT NULL default '0', `level` tinyint(4) unsigned NOT NULL default '0', `title` varchar(255) default NULL, PRIMARY KEY  (`id`,`pid`,`map`), KEY `level` (`level`), KEY `id` (`id`,`map`)) ;
 INSERT INTO `t2` VALUES (6,5,12,7,'a'),(12,0,0,7,'a'),(12,1,0,7,'a'),(12,5,5,7,'a'),(12,5,12,7,'a');
 SELECT b.sc FROM (SELECT (SELECT a.access FROM t1 a WHERE a.map = op.map AND a.slave = op.pid AND a.master = 1) ac FROM t2 op WHERE op.id = 12 AND op.map = 0) b;
-ERROR 42S22: Unknown column 'b.sc' in 'field list'
+ERROR 42S22: Unknown column 'b.sc' in 'SELECT'
 SELECT b.ac FROM (SELECT (SELECT a.access FROM t1 a WHERE a.map = op.map AND a.slave = op.pid AND a.master = 1) ac FROM t2 op WHERE op.id = 12 AND op.map = 0) b;
 ac
 700
@@ -2743,7 +2743,7 @@ drop table t1;
 create table t1 (a1 int);
 create table t2 (b1 int);
 select * from t1 where a2 > any(select b1 from t2);
-ERROR 42S22: Unknown column 'a2' in 'IN/ALL/ANY subquery'
+ERROR 42S22: Unknown column 'a2' in 'IN/ALL/ANY'
 select * from t1 where a1 > any(select b1 from t2);
 a1
 drop table t1,t2;
@@ -3668,11 +3668,11 @@ delete from t1 where c <= 1140006215 and (select b from t2 where a = 2) = 1;
 drop table t1, t2;
 CREATE TABLE t1 (a INT);
 CREATE VIEW v1 AS SELECT * FROM t1 WHERE no_such_column = ANY (SELECT 1);
-ERROR 42S22: Unknown column 'no_such_column' in 'IN/ALL/ANY subquery'
+ERROR 42S22: Unknown column 'no_such_column' in 'IN/ALL/ANY'
 CREATE VIEW v2 AS SELECT * FROM t1 WHERE no_such_column = (SELECT 1);
-ERROR 42S22: Unknown column 'no_such_column' in 'where clause'
+ERROR 42S22: Unknown column 'no_such_column' in 'WHERE'
 SELECT * FROM t1 WHERE no_such_column = ANY (SELECT 1);
-ERROR 42S22: Unknown column 'no_such_column' in 'IN/ALL/ANY subquery'
+ERROR 42S22: Unknown column 'no_such_column' in 'IN/ALL/ANY'
 DROP TABLE t1;
 create table t1 (i int, j bigint);
 insert into t1 values (1, 2), (2, 2), (3, 2);
@@ -4474,11 +4474,11 @@ EXPLAIN
 SELECT a AS out_a, MIN(b) FROM t1
 WHERE b > (SELECT MIN(b) FROM t1 WHERE a = out_a)
 GROUP BY a;
-ERROR 42S22: Unknown column 'out_a' in 'where clause'
+ERROR 42S22: Unknown column 'out_a' in 'WHERE'
 SELECT a AS out_a, MIN(b) FROM t1
 WHERE b > (SELECT MIN(b) FROM t1 WHERE a = out_a)
 GROUP BY a;
-ERROR 42S22: Unknown column 'out_a' in 'where clause'
+ERROR 42S22: Unknown column 'out_a' in 'WHERE'
 EXPLAIN
 SELECT a AS out_a, MIN(b) FROM t1 t1_outer
 WHERE b > (SELECT MIN(b) FROM t1 WHERE a = t1_outer.a)
@@ -5466,7 +5466,7 @@ INSERT INTO t1 VALUES (repeat('b',@@global.max_allowed_packet));
 EXPLAIN EXTENDED SELECT DISTINCT 1 FROM t1,
 (SELECT DISTINCTROW a AS away FROM t1 GROUP BY a WITH ROLLUP) AS d1  
 WHERE t1.a = d1.a;
-ERROR 42S22: Unknown column 'd1.a' in 'where clause'
+ERROR 42S22: Unknown column 'd1.a' in 'WHERE'
 DROP TABLE t1;
 Set up test tables.
 CREATE TABLE t1 (
diff --git a/mysql-test/main/subselect_no_mat.result b/mysql-test/main/subselect_no_mat.result
index 5183d50cd49..b995edc75ff 100644
--- a/mysql-test/main/subselect_no_mat.result
+++ b/mysql-test/main/subselect_no_mat.result
@@ -70,12 +70,12 @@ SELECT 1 FROM (SELECT 1 as a) as b HAVING (SELECT a)=1;
 1
 1
 SELECT (SELECT 1), a;
-ERROR 42S22: Unknown column 'a' in 'field list'
+ERROR 42S22: Unknown column 'a' in 'SELECT'
 SELECT 1 as a FROM (SELECT 1) as b HAVING (SELECT a)=1;
 a
 1
 SELECT 1 FROM (SELECT (SELECT a) b) c;
-ERROR 42S22: Unknown column 'a' in 'field list'
+ERROR 42S22: Unknown column 'a' in 'SELECT'
 SELECT * FROM (SELECT 1 as id) b WHERE id IN (SELECT * FROM (SELECT 1 as id) c ORDER BY id);
 id
 1
@@ -92,9 +92,9 @@ ERROR 42000: You have an error in your SQL syntax; check the manual that corresp
 SELECT 1 FROM (SELECT 1) a PROCEDURE ANALYSE((SELECT 1));
 ERROR 42000: PROCEDURE does not support subqueries or stored functions
 SELECT (SELECT 1) as a FROM (SELECT 1) b WHERE (SELECT a) IS NULL;
-ERROR 42S22: Unknown column 'a' in 'field list'
+ERROR 42S22: Unknown column 'a' in 'SELECT'
 SELECT (SELECT 1) as a FROM (SELECT 1) b WHERE (SELECT a) IS NOT NULL;
-ERROR 42S22: Unknown column 'a' in 'field list'
+ERROR 42S22: Unknown column 'a' in 'SELECT'
 SELECT (SELECT 1,2,3) = ROW(1,2,3);
 (SELECT 1,2,3) = ROW(1,2,3)
 1
@@ -377,7 +377,7 @@ Warnings:
 Note	1276	Field or reference 'test.t6.clinic_uq' of SELECT #2 was resolved in SELECT #1
 Note	1003	select `test`.`t6`.`patient_uq` AS `patient_uq`,`test`.`t6`.`clinic_uq` AS `clinic_uq` from `test`.`t7` join `test`.`t6` where `test`.`t6`.`clinic_uq` = `test`.`t7`.`uq`
 select * from t1 where a= (select a from t2,t4 where t2.b=t4.b);
-ERROR 23000: Column 'a' in field list is ambiguous
+ERROR 23000: Column 'a' in SELECT is ambiguous
 drop table t1,t2,t3;
 CREATE TABLE t3 (a varchar(20),b char(1) NOT NULL default '0');
 INSERT INTO t3 VALUES ('W','a'),('A','c'),('J','b');
@@ -488,9 +488,9 @@ numeropost	maxnumrep
 43506	2
 40143	1
 SELECT (SELECT 1) as a FROM (SELECT 1 FROM t1 HAVING a=1) b;
-ERROR 42S22: Unknown column 'a' in 'having clause'
+ERROR 42S22: Unknown column 'a' in 'HAVING'
 SELECT 1 IN (SELECT 1 FROM t2 HAVING a);
-ERROR 42S22: Unknown column 'a' in 'having clause'
+ERROR 42S22: Unknown column 'a' in 'HAVING'
 SELECT * from t2 where topic IN (SELECT topic FROM t2 GROUP BY topic);
 mot	topic	date	pseudo
 joce	40143	2002-10-22	joce
@@ -583,7 +583,7 @@ KEY `pseudo` (`pseudo`,`numeropost`)
 SELECT (SELECT numeropost FROM t1 HAVING numreponse=a),numreponse FROM (SELECT * FROM t1) as a;
 ERROR 42S22: Reference 'numreponse' not supported (forward reference in item list)
 SELECT numreponse, (SELECT numeropost FROM t1 HAVING numreponse=a) FROM (SELECT * FROM t1) as a;
-ERROR 42S22: Unknown column 'a' in 'having clause'
+ERROR 42S22: Unknown column 'a' in 'HAVING'
 SELECT numreponse, (SELECT numeropost FROM t1 HAVING numreponse=1) FROM (SELECT * FROM t1) as a;
 numreponse	(SELECT numeropost FROM t1 HAVING numreponse=1)
 INSERT INTO t1 (numeropost,numreponse,pseudo) VALUES (1,1,'joce'),(1,2,'joce'),(1,3,'test');
@@ -1411,7 +1411,7 @@ INSERT INTO t1 VALUES (1);
 UPDATE t1 SET i=i+(SELECT MAX(i) FROM (SELECT 1) t) WHERE i=(SELECT MAX(i));
 UPDATE t1 SET i=i+1 WHERE i=(SELECT MAX(i));
 UPDATE t1 SET t.i=i+(SELECT MAX(i) FROM (SELECT 1) t);
-ERROR 42S22: Unknown column 't.i' in 'field list'
+ERROR 42S22: Unknown column 't.i' in 'SET'
 select * from t1;
 i
 3
@@ -1615,7 +1615,7 @@ create table t2 (s1 int);
 insert into t1 values (1);
 insert into t2 values (1);
 update t1 set  s1 = s1 + 1 where 1 = (select x.s1 as A from t2 WHERE t2.s1 > t1.s1 order by A);
-ERROR 42S22: Unknown column 'x.s1' in 'field list'
+ERROR 42S22: Unknown column 'x.s1' in 'SELECT'
 DROP TABLE t1, t2;
 CREATE TABLE t1 (s1 CHAR(5) COLLATE latin1_german1_ci,
 s2 CHAR(5) COLLATE latin1_swedish_ci);
@@ -1849,11 +1849,11 @@ drop table t1, t2;
 create table t1 (s1 int);
 create table t2 (s1 int);
 select * from t1 where (select count(*) from t2 where t1.s2) = 1;
-ERROR 42S22: Unknown column 't1.s2' in 'where clause'
+ERROR 42S22: Unknown column 't1.s2' in 'WHERE'
 select * from t1 where (select count(*) from t2 group by t1.s2) = 1;
-ERROR 42S22: Unknown column 't1.s2' in 'group statement'
+ERROR 42S22: Unknown column 't1.s2' in 'GROUP BY'
 select count(*) from t2 group by t1.s2;
-ERROR 42S22: Unknown column 't1.s2' in 'group statement'
+ERROR 42S22: Unknown column 't1.s2' in 'GROUP BY'
 drop table t1, t2;
 CREATE TABLE t1(COLA FLOAT NOT NULL,COLB FLOAT NOT NULL,COLC VARCHAR(20) DEFAULT NULL,PRIMARY KEY (COLA, COLB));
 CREATE TABLE t2(COLA FLOAT NOT NULL,COLB FLOAT NOT NULL,COLC CHAR(1) NOT NULL,PRIMARY KEY (COLA));
@@ -2655,7 +2655,7 @@ INSERT INTO `t1` VALUES (1,0,0,700),(1,1,1,400),(1,5,5,400),(1,12,12,400),(1,12,
 CREATE TABLE `t2` ( `id` int(10) unsigned NOT NULL default '0', `pid` int(10) unsigned NOT NULL default '0', `map` smallint(6) unsigned NOT NULL default '0', `level` tinyint(4) unsigned NOT NULL default '0', `title` varchar(255) default NULL, PRIMARY KEY  (`id`,`pid`,`map`), KEY `level` (`level`), KEY `id` (`id`,`map`)) ;
 INSERT INTO `t2` VALUES (6,5,12,7,'a'),(12,0,0,7,'a'),(12,1,0,7,'a'),(12,5,5,7,'a'),(12,5,12,7,'a');
 SELECT b.sc FROM (SELECT (SELECT a.access FROM t1 a WHERE a.map = op.map AND a.slave = op.pid AND a.master = 1) ac FROM t2 op WHERE op.id = 12 AND op.map = 0) b;
-ERROR 42S22: Unknown column 'b.sc' in 'field list'
+ERROR 42S22: Unknown column 'b.sc' in 'SELECT'
 SELECT b.ac FROM (SELECT (SELECT a.access FROM t1 a WHERE a.map = op.map AND a.slave = op.pid AND a.master = 1) ac FROM t2 op WHERE op.id = 12 AND op.map = 0) b;
 ac
 700
@@ -2746,7 +2746,7 @@ drop table t1;
 create table t1 (a1 int);
 create table t2 (b1 int);
 select * from t1 where a2 > any(select b1 from t2);
-ERROR 42S22: Unknown column 'a2' in 'IN/ALL/ANY subquery'
+ERROR 42S22: Unknown column 'a2' in 'IN/ALL/ANY'
 select * from t1 where a1 > any(select b1 from t2);
 a1
 drop table t1,t2;
@@ -3668,11 +3668,11 @@ delete from t1 where c <= 1140006215 and (select b from t2 where a = 2) = 1;
 drop table t1, t2;
 CREATE TABLE t1 (a INT);
 CREATE VIEW v1 AS SELECT * FROM t1 WHERE no_such_column = ANY (SELECT 1);
-ERROR 42S22: Unknown column 'no_such_column' in 'IN/ALL/ANY subquery'
+ERROR 42S22: Unknown column 'no_such_column' in 'IN/ALL/ANY'
 CREATE VIEW v2 AS SELECT * FROM t1 WHERE no_such_column = (SELECT 1);
-ERROR 42S22: Unknown column 'no_such_column' in 'where clause'
+ERROR 42S22: Unknown column 'no_such_column' in 'WHERE'
 SELECT * FROM t1 WHERE no_such_column = ANY (SELECT 1);
-ERROR 42S22: Unknown column 'no_such_column' in 'IN/ALL/ANY subquery'
+ERROR 42S22: Unknown column 'no_such_column' in 'IN/ALL/ANY'
 DROP TABLE t1;
 create table t1 (i int, j bigint);
 insert into t1 values (1, 2), (2, 2), (3, 2);
@@ -4474,11 +4474,11 @@ EXPLAIN
 SELECT a AS out_a, MIN(b) FROM t1
 WHERE b > (SELECT MIN(b) FROM t1 WHERE a = out_a)
 GROUP BY a;
-ERROR 42S22: Unknown column 'out_a' in 'where clause'
+ERROR 42S22: Unknown column 'out_a' in 'WHERE'
 SELECT a AS out_a, MIN(b) FROM t1
 WHERE b > (SELECT MIN(b) FROM t1 WHERE a = out_a)
 GROUP BY a;
-ERROR 42S22: Unknown column 'out_a' in 'where clause'
+ERROR 42S22: Unknown column 'out_a' in 'WHERE'
 EXPLAIN
 SELECT a AS out_a, MIN(b) FROM t1 t1_outer
 WHERE b > (SELECT MIN(b) FROM t1 WHERE a = t1_outer.a)
@@ -5464,7 +5464,7 @@ INSERT INTO t1 VALUES (repeat('b',@@global.max_allowed_packet));
 EXPLAIN EXTENDED SELECT DISTINCT 1 FROM t1,
 (SELECT DISTINCTROW a AS away FROM t1 GROUP BY a WITH ROLLUP) AS d1  
 WHERE t1.a = d1.a;
-ERROR 42S22: Unknown column 'd1.a' in 'where clause'
+ERROR 42S22: Unknown column 'd1.a' in 'WHERE'
 DROP TABLE t1;
 Set up test tables.
 CREATE TABLE t1 (
diff --git a/mysql-test/main/subselect_no_opts.result b/mysql-test/main/subselect_no_opts.result
index 603958d2815..5f529e19db4 100644
--- a/mysql-test/main/subselect_no_opts.result
+++ b/mysql-test/main/subselect_no_opts.result
@@ -66,12 +66,12 @@ SELECT 1 FROM (SELECT 1 as a) as b HAVING (SELECT a)=1;
 1
 1
 SELECT (SELECT 1), a;
-ERROR 42S22: Unknown column 'a' in 'field list'
+ERROR 42S22: Unknown column 'a' in 'SELECT'
 SELECT 1 as a FROM (SELECT 1) as b HAVING (SELECT a)=1;
 a
 1
 SELECT 1 FROM (SELECT (SELECT a) b) c;
-ERROR 42S22: Unknown column 'a' in 'field list'
+ERROR 42S22: Unknown column 'a' in 'SELECT'
 SELECT * FROM (SELECT 1 as id) b WHERE id IN (SELECT * FROM (SELECT 1 as id) c ORDER BY id);
 id
 1
@@ -88,9 +88,9 @@ ERROR 42000: You have an error in your SQL syntax; check the manual that corresp
 SELECT 1 FROM (SELECT 1) a PROCEDURE ANALYSE((SELECT 1));
 ERROR 42000: PROCEDURE does not support subqueries or stored functions
 SELECT (SELECT 1) as a FROM (SELECT 1) b WHERE (SELECT a) IS NULL;
-ERROR 42S22: Unknown column 'a' in 'field list'
+ERROR 42S22: Unknown column 'a' in 'SELECT'
 SELECT (SELECT 1) as a FROM (SELECT 1) b WHERE (SELECT a) IS NOT NULL;
-ERROR 42S22: Unknown column 'a' in 'field list'
+ERROR 42S22: Unknown column 'a' in 'SELECT'
 SELECT (SELECT 1,2,3) = ROW(1,2,3);
 (SELECT 1,2,3) = ROW(1,2,3)
 1
@@ -373,7 +373,7 @@ Warnings:
 Note	1276	Field or reference 'test.t6.clinic_uq' of SELECT #2 was resolved in SELECT #1
 Note	1003	/* select#1 */ select `test`.`t6`.`patient_uq` AS `patient_uq`,`test`.`t6`.`clinic_uq` AS `clinic_uq` from `test`.`t6` where <in_optimizer>(`test`.`t6`.`clinic_uq`,<exists>(<primary_index_lookup>(<cache>(`test`.`t6`.`clinic_uq`) in t7 on PRIMARY)))
 select * from t1 where a= (select a from t2,t4 where t2.b=t4.b);
-ERROR 23000: Column 'a' in field list is ambiguous
+ERROR 23000: Column 'a' in SELECT is ambiguous
 drop table t1,t2,t3;
 CREATE TABLE t3 (a varchar(20),b char(1) NOT NULL default '0');
 INSERT INTO t3 VALUES ('W','a'),('A','c'),('J','b');
@@ -484,9 +484,9 @@ numeropost	maxnumrep
 43506	2
 40143	1
 SELECT (SELECT 1) as a FROM (SELECT 1 FROM t1 HAVING a=1) b;
-ERROR 42S22: Unknown column 'a' in 'having clause'
+ERROR 42S22: Unknown column 'a' in 'HAVING'
 SELECT 1 IN (SELECT 1 FROM t2 HAVING a);
-ERROR 42S22: Unknown column 'a' in 'having clause'
+ERROR 42S22: Unknown column 'a' in 'HAVING'
 SELECT * from t2 where topic IN (SELECT topic FROM t2 GROUP BY topic);
 mot	topic	date	pseudo
 joce	40143	2002-10-22	joce
@@ -579,7 +579,7 @@ KEY `pseudo` (`pseudo`,`numeropost`)
 SELECT (SELECT numeropost FROM t1 HAVING numreponse=a),numreponse FROM (SELECT * FROM t1) as a;
 ERROR 42S22: Reference 'numreponse' not supported (forward reference in item list)
 SELECT numreponse, (SELECT numeropost FROM t1 HAVING numreponse=a) FROM (SELECT * FROM t1) as a;
-ERROR 42S22: Unknown column 'a' in 'having clause'
+ERROR 42S22: Unknown column 'a' in 'HAVING'
 SELECT numreponse, (SELECT numeropost FROM t1 HAVING numreponse=1) FROM (SELECT * FROM t1) as a;
 numreponse	(SELECT numeropost FROM t1 HAVING numreponse=1)
 INSERT INTO t1 (numeropost,numreponse,pseudo) VALUES (1,1,'joce'),(1,2,'joce'),(1,3,'test');
@@ -1407,7 +1407,7 @@ INSERT INTO t1 VALUES (1);
 UPDATE t1 SET i=i+(SELECT MAX(i) FROM (SELECT 1) t) WHERE i=(SELECT MAX(i));
 UPDATE t1 SET i=i+1 WHERE i=(SELECT MAX(i));
 UPDATE t1 SET t.i=i+(SELECT MAX(i) FROM (SELECT 1) t);
-ERROR 42S22: Unknown column 't.i' in 'field list'
+ERROR 42S22: Unknown column 't.i' in 'SET'
 select * from t1;
 i
 3
@@ -1611,7 +1611,7 @@ create table t2 (s1 int);
 insert into t1 values (1);
 insert into t2 values (1);
 update t1 set  s1 = s1 + 1 where 1 = (select x.s1 as A from t2 WHERE t2.s1 > t1.s1 order by A);
-ERROR 42S22: Unknown column 'x.s1' in 'field list'
+ERROR 42S22: Unknown column 'x.s1' in 'SELECT'
 DROP TABLE t1, t2;
 CREATE TABLE t1 (s1 CHAR(5) COLLATE latin1_german1_ci,
 s2 CHAR(5) COLLATE latin1_swedish_ci);
@@ -1845,11 +1845,11 @@ drop table t1, t2;
 create table t1 (s1 int);
 create table t2 (s1 int);
 select * from t1 where (select count(*) from t2 where t1.s2) = 1;
-ERROR 42S22: Unknown column 't1.s2' in 'where clause'
+ERROR 42S22: Unknown column 't1.s2' in 'WHERE'
 select * from t1 where (select count(*) from t2 group by t1.s2) = 1;
-ERROR 42S22: Unknown column 't1.s2' in 'group statement'
+ERROR 42S22: Unknown column 't1.s2' in 'GROUP BY'
 select count(*) from t2 group by t1.s2;
-ERROR 42S22: Unknown column 't1.s2' in 'group statement'
+ERROR 42S22: Unknown column 't1.s2' in 'GROUP BY'
 drop table t1, t2;
 CREATE TABLE t1(COLA FLOAT NOT NULL,COLB FLOAT NOT NULL,COLC VARCHAR(20) DEFAULT NULL,PRIMARY KEY (COLA, COLB));
 CREATE TABLE t2(COLA FLOAT NOT NULL,COLB FLOAT NOT NULL,COLC CHAR(1) NOT NULL,PRIMARY KEY (COLA));
@@ -2651,7 +2651,7 @@ INSERT INTO `t1` VALUES (1,0,0,700),(1,1,1,400),(1,5,5,400),(1,12,12,400),(1,12,
 CREATE TABLE `t2` ( `id` int(10) unsigned NOT NULL default '0', `pid` int(10) unsigned NOT NULL default '0', `map` smallint(6) unsigned NOT NULL default '0', `level` tinyint(4) unsigned NOT NULL default '0', `title` varchar(255) default NULL, PRIMARY KEY  (`id`,`pid`,`map`), KEY `level` (`level`), KEY `id` (`id`,`map`)) ;
 INSERT INTO `t2` VALUES (6,5,12,7,'a'),(12,0,0,7,'a'),(12,1,0,7,'a'),(12,5,5,7,'a'),(12,5,12,7,'a');
 SELECT b.sc FROM (SELECT (SELECT a.access FROM t1 a WHERE a.map = op.map AND a.slave = op.pid AND a.master = 1) ac FROM t2 op WHERE op.id = 12 AND op.map = 0) b;
-ERROR 42S22: Unknown column 'b.sc' in 'field list'
+ERROR 42S22: Unknown column 'b.sc' in 'SELECT'
 SELECT b.ac FROM (SELECT (SELECT a.access FROM t1 a WHERE a.map = op.map AND a.slave = op.pid AND a.master = 1) ac FROM t2 op WHERE op.id = 12 AND op.map = 0) b;
 ac
 700
@@ -2742,7 +2742,7 @@ drop table t1;
 create table t1 (a1 int);
 create table t2 (b1 int);
 select * from t1 where a2 > any(select b1 from t2);
-ERROR 42S22: Unknown column 'a2' in 'IN/ALL/ANY subquery'
+ERROR 42S22: Unknown column 'a2' in 'IN/ALL/ANY'
 select * from t1 where a1 > any(select b1 from t2);
 a1
 drop table t1,t2;
@@ -3664,11 +3664,11 @@ delete from t1 where c <= 1140006215 and (select b from t2 where a = 2) = 1;
 drop table t1, t2;
 CREATE TABLE t1 (a INT);
 CREATE VIEW v1 AS SELECT * FROM t1 WHERE no_such_column = ANY (SELECT 1);
-ERROR 42S22: Unknown column 'no_such_column' in 'IN/ALL/ANY subquery'
+ERROR 42S22: Unknown column 'no_such_column' in 'IN/ALL/ANY'
 CREATE VIEW v2 AS SELECT * FROM t1 WHERE no_such_column = (SELECT 1);
-ERROR 42S22: Unknown column 'no_such_column' in 'where clause'
+ERROR 42S22: Unknown column 'no_such_column' in 'WHERE'
 SELECT * FROM t1 WHERE no_such_column = ANY (SELECT 1);
-ERROR 42S22: Unknown column 'no_such_column' in 'IN/ALL/ANY subquery'
+ERROR 42S22: Unknown column 'no_such_column' in 'IN/ALL/ANY'
 DROP TABLE t1;
 create table t1 (i int, j bigint);
 insert into t1 values (1, 2), (2, 2), (3, 2);
@@ -4470,11 +4470,11 @@ EXPLAIN
 SELECT a AS out_a, MIN(b) FROM t1
 WHERE b > (SELECT MIN(b) FROM t1 WHERE a = out_a)
 GROUP BY a;
-ERROR 42S22: Unknown column 'out_a' in 'where clause'
+ERROR 42S22: Unknown column 'out_a' in 'WHERE'
 SELECT a AS out_a, MIN(b) FROM t1
 WHERE b > (SELECT MIN(b) FROM t1 WHERE a = out_a)
 GROUP BY a;
-ERROR 42S22: Unknown column 'out_a' in 'where clause'
+ERROR 42S22: Unknown column 'out_a' in 'WHERE'
 EXPLAIN
 SELECT a AS out_a, MIN(b) FROM t1 t1_outer
 WHERE b > (SELECT MIN(b) FROM t1 WHERE a = t1_outer.a)
@@ -5460,7 +5460,7 @@ INSERT INTO t1 VALUES (repeat('b',@@global.max_allowed_packet));
 EXPLAIN EXTENDED SELECT DISTINCT 1 FROM t1,
 (SELECT DISTINCTROW a AS away FROM t1 GROUP BY a WITH ROLLUP) AS d1  
 WHERE t1.a = d1.a;
-ERROR 42S22: Unknown column 'd1.a' in 'where clause'
+ERROR 42S22: Unknown column 'd1.a' in 'WHERE'
 DROP TABLE t1;
 Set up test tables.
 CREATE TABLE t1 (
diff --git a/mysql-test/main/subselect_no_scache.result b/mysql-test/main/subselect_no_scache.result
index 67d738a8a78..0745a5486bb 100644
--- a/mysql-test/main/subselect_no_scache.result
+++ b/mysql-test/main/subselect_no_scache.result
@@ -69,12 +69,12 @@ SELECT 1 FROM (SELECT 1 as a) as b HAVING (SELECT a)=1;
 1
 1
 SELECT (SELECT 1), a;
-ERROR 42S22: Unknown column 'a' in 'field list'
+ERROR 42S22: Unknown column 'a' in 'SELECT'
 SELECT 1 as a FROM (SELECT 1) as b HAVING (SELECT a)=1;
 a
 1
 SELECT 1 FROM (SELECT (SELECT a) b) c;
-ERROR 42S22: Unknown column 'a' in 'field list'
+ERROR 42S22: Unknown column 'a' in 'SELECT'
 SELECT * FROM (SELECT 1 as id) b WHERE id IN (SELECT * FROM (SELECT 1 as id) c ORDER BY id);
 id
 1
@@ -91,9 +91,9 @@ ERROR 42000: You have an error in your SQL syntax; check the manual that corresp
 SELECT 1 FROM (SELECT 1) a PROCEDURE ANALYSE((SELECT 1));
 ERROR 42000: PROCEDURE does not support subqueries or stored functions
 SELECT (SELECT 1) as a FROM (SELECT 1) b WHERE (SELECT a) IS NULL;
-ERROR 42S22: Unknown column 'a' in 'field list'
+ERROR 42S22: Unknown column 'a' in 'SELECT'
 SELECT (SELECT 1) as a FROM (SELECT 1) b WHERE (SELECT a) IS NOT NULL;
-ERROR 42S22: Unknown column 'a' in 'field list'
+ERROR 42S22: Unknown column 'a' in 'SELECT'
 SELECT (SELECT 1,2,3) = ROW(1,2,3);
 (SELECT 1,2,3) = ROW(1,2,3)
 1
@@ -376,7 +376,7 @@ Warnings:
 Note	1276	Field or reference 'test.t6.clinic_uq' of SELECT #2 was resolved in SELECT #1
 Note	1003	select `test`.`t6`.`patient_uq` AS `patient_uq`,`test`.`t6`.`clinic_uq` AS `clinic_uq` from `test`.`t7` join `test`.`t6` where `test`.`t6`.`clinic_uq` = `test`.`t7`.`uq`
 select * from t1 where a= (select a from t2,t4 where t2.b=t4.b);
-ERROR 23000: Column 'a' in field list is ambiguous
+ERROR 23000: Column 'a' in SELECT is ambiguous
 drop table t1,t2,t3;
 CREATE TABLE t3 (a varchar(20),b char(1) NOT NULL default '0');
 INSERT INTO t3 VALUES ('W','a'),('A','c'),('J','b');
@@ -487,9 +487,9 @@ numeropost	maxnumrep
 43506	2
 40143	1
 SELECT (SELECT 1) as a FROM (SELECT 1 FROM t1 HAVING a=1) b;
-ERROR 42S22: Unknown column 'a' in 'having clause'
+ERROR 42S22: Unknown column 'a' in 'HAVING'
 SELECT 1 IN (SELECT 1 FROM t2 HAVING a);
-ERROR 42S22: Unknown column 'a' in 'having clause'
+ERROR 42S22: Unknown column 'a' in 'HAVING'
 SELECT * from t2 where topic IN (SELECT topic FROM t2 GROUP BY topic);
 mot	topic	date	pseudo
 joce	40143	2002-10-22	joce
@@ -582,7 +582,7 @@ KEY `pseudo` (`pseudo`,`numeropost`)
 SELECT (SELECT numeropost FROM t1 HAVING numreponse=a),numreponse FROM (SELECT * FROM t1) as a;
 ERROR 42S22: Reference 'numreponse' not supported (forward reference in item list)
 SELECT numreponse, (SELECT numeropost FROM t1 HAVING numreponse=a) FROM (SELECT * FROM t1) as a;
-ERROR 42S22: Unknown column 'a' in 'having clause'
+ERROR 42S22: Unknown column 'a' in 'HAVING'
 SELECT numreponse, (SELECT numeropost FROM t1 HAVING numreponse=1) FROM (SELECT * FROM t1) as a;
 numreponse	(SELECT numeropost FROM t1 HAVING numreponse=1)
 INSERT INTO t1 (numeropost,numreponse,pseudo) VALUES (1,1,'joce'),(1,2,'joce'),(1,3,'test');
@@ -1410,7 +1410,7 @@ INSERT INTO t1 VALUES (1);
 UPDATE t1 SET i=i+(SELECT MAX(i) FROM (SELECT 1) t) WHERE i=(SELECT MAX(i));
 UPDATE t1 SET i=i+1 WHERE i=(SELECT MAX(i));
 UPDATE t1 SET t.i=i+(SELECT MAX(i) FROM (SELECT 1) t);
-ERROR 42S22: Unknown column 't.i' in 'field list'
+ERROR 42S22: Unknown column 't.i' in 'SET'
 select * from t1;
 i
 3
@@ -1614,7 +1614,7 @@ create table t2 (s1 int);
 insert into t1 values (1);
 insert into t2 values (1);
 update t1 set  s1 = s1 + 1 where 1 = (select x.s1 as A from t2 WHERE t2.s1 > t1.s1 order by A);
-ERROR 42S22: Unknown column 'x.s1' in 'field list'
+ERROR 42S22: Unknown column 'x.s1' in 'SELECT'
 DROP TABLE t1, t2;
 CREATE TABLE t1 (s1 CHAR(5) COLLATE latin1_german1_ci,
 s2 CHAR(5) COLLATE latin1_swedish_ci);
@@ -1848,11 +1848,11 @@ drop table t1, t2;
 create table t1 (s1 int);
 create table t2 (s1 int);
 select * from t1 where (select count(*) from t2 where t1.s2) = 1;
-ERROR 42S22: Unknown column 't1.s2' in 'where clause'
+ERROR 42S22: Unknown column 't1.s2' in 'WHERE'
 select * from t1 where (select count(*) from t2 group by t1.s2) = 1;
-ERROR 42S22: Unknown column 't1.s2' in 'group statement'
+ERROR 42S22: Unknown column 't1.s2' in 'GROUP BY'
 select count(*) from t2 group by t1.s2;
-ERROR 42S22: Unknown column 't1.s2' in 'group statement'
+ERROR 42S22: Unknown column 't1.s2' in 'GROUP BY'
 drop table t1, t2;
 CREATE TABLE t1(COLA FLOAT NOT NULL,COLB FLOAT NOT NULL,COLC VARCHAR(20) DEFAULT NULL,PRIMARY KEY (COLA, COLB));
 CREATE TABLE t2(COLA FLOAT NOT NULL,COLB FLOAT NOT NULL,COLC CHAR(1) NOT NULL,PRIMARY KEY (COLA));
@@ -2655,7 +2655,7 @@ INSERT INTO `t1` VALUES (1,0,0,700),(1,1,1,400),(1,5,5,400),(1,12,12,400),(1,12,
 CREATE TABLE `t2` ( `id` int(10) unsigned NOT NULL default '0', `pid` int(10) unsigned NOT NULL default '0', `map` smallint(6) unsigned NOT NULL default '0', `level` tinyint(4) unsigned NOT NULL default '0', `title` varchar(255) default NULL, PRIMARY KEY  (`id`,`pid`,`map`), KEY `level` (`level`), KEY `id` (`id`,`map`)) ;
 INSERT INTO `t2` VALUES (6,5,12,7,'a'),(12,0,0,7,'a'),(12,1,0,7,'a'),(12,5,5,7,'a'),(12,5,12,7,'a');
 SELECT b.sc FROM (SELECT (SELECT a.access FROM t1 a WHERE a.map = op.map AND a.slave = op.pid AND a.master = 1) ac FROM t2 op WHERE op.id = 12 AND op.map = 0) b;
-ERROR 42S22: Unknown column 'b.sc' in 'field list'
+ERROR 42S22: Unknown column 'b.sc' in 'SELECT'
 SELECT b.ac FROM (SELECT (SELECT a.access FROM t1 a WHERE a.map = op.map AND a.slave = op.pid AND a.master = 1) ac FROM t2 op WHERE op.id = 12 AND op.map = 0) b;
 ac
 700
@@ -2746,7 +2746,7 @@ drop table t1;
 create table t1 (a1 int);
 create table t2 (b1 int);
 select * from t1 where a2 > any(select b1 from t2);
-ERROR 42S22: Unknown column 'a2' in 'IN/ALL/ANY subquery'
+ERROR 42S22: Unknown column 'a2' in 'IN/ALL/ANY'
 select * from t1 where a1 > any(select b1 from t2);
 a1
 drop table t1,t2;
@@ -3671,11 +3671,11 @@ delete from t1 where c <= 1140006215 and (select b from t2 where a = 2) = 1;
 drop table t1, t2;
 CREATE TABLE t1 (a INT);
 CREATE VIEW v1 AS SELECT * FROM t1 WHERE no_such_column = ANY (SELECT 1);
-ERROR 42S22: Unknown column 'no_such_column' in 'IN/ALL/ANY subquery'
+ERROR 42S22: Unknown column 'no_such_column' in 'IN/ALL/ANY'
 CREATE VIEW v2 AS SELECT * FROM t1 WHERE no_such_column = (SELECT 1);
-ERROR 42S22: Unknown column 'no_such_column' in 'where clause'
+ERROR 42S22: Unknown column 'no_such_column' in 'WHERE'
 SELECT * FROM t1 WHERE no_such_column = ANY (SELECT 1);
-ERROR 42S22: Unknown column 'no_such_column' in 'IN/ALL/ANY subquery'
+ERROR 42S22: Unknown column 'no_such_column' in 'IN/ALL/ANY'
 DROP TABLE t1;
 create table t1 (i int, j bigint);
 insert into t1 values (1, 2), (2, 2), (3, 2);
@@ -4477,11 +4477,11 @@ EXPLAIN
 SELECT a AS out_a, MIN(b) FROM t1
 WHERE b > (SELECT MIN(b) FROM t1 WHERE a = out_a)
 GROUP BY a;
-ERROR 42S22: Unknown column 'out_a' in 'where clause'
+ERROR 42S22: Unknown column 'out_a' in 'WHERE'
 SELECT a AS out_a, MIN(b) FROM t1
 WHERE b > (SELECT MIN(b) FROM t1 WHERE a = out_a)
 GROUP BY a;
-ERROR 42S22: Unknown column 'out_a' in 'where clause'
+ERROR 42S22: Unknown column 'out_a' in 'WHERE'
 EXPLAIN
 SELECT a AS out_a, MIN(b) FROM t1 t1_outer
 WHERE b > (SELECT MIN(b) FROM t1 WHERE a = t1_outer.a)
@@ -5470,7 +5470,7 @@ INSERT INTO t1 VALUES (repeat('b',@@global.max_allowed_packet));
 EXPLAIN EXTENDED SELECT DISTINCT 1 FROM t1,
 (SELECT DISTINCTROW a AS away FROM t1 GROUP BY a WITH ROLLUP) AS d1  
 WHERE t1.a = d1.a;
-ERROR 42S22: Unknown column 'd1.a' in 'where clause'
+ERROR 42S22: Unknown column 'd1.a' in 'WHERE'
 DROP TABLE t1;
 Set up test tables.
 CREATE TABLE t1 (
diff --git a/mysql-test/main/subselect_no_semijoin.result b/mysql-test/main/subselect_no_semijoin.result
index 0ec32e0fbf8..8f5b71b7308 100644
--- a/mysql-test/main/subselect_no_semijoin.result
+++ b/mysql-test/main/subselect_no_semijoin.result
@@ -66,12 +66,12 @@ SELECT 1 FROM (SELECT 1 as a) as b HAVING (SELECT a)=1;
 1
 1
 SELECT (SELECT 1), a;
-ERROR 42S22: Unknown column 'a' in 'field list'
+ERROR 42S22: Unknown column 'a' in 'SELECT'
 SELECT 1 as a FROM (SELECT 1) as b HAVING (SELECT a)=1;
 a
 1
 SELECT 1 FROM (SELECT (SELECT a) b) c;
-ERROR 42S22: Unknown column 'a' in 'field list'
+ERROR 42S22: Unknown column 'a' in 'SELECT'
 SELECT * FROM (SELECT 1 as id) b WHERE id IN (SELECT * FROM (SELECT 1 as id) c ORDER BY id);
 id
 1
@@ -88,9 +88,9 @@ ERROR 42000: You have an error in your SQL syntax; check the manual that corresp
 SELECT 1 FROM (SELECT 1) a PROCEDURE ANALYSE((SELECT 1));
 ERROR 42000: PROCEDURE does not support subqueries or stored functions
 SELECT (SELECT 1) as a FROM (SELECT 1) b WHERE (SELECT a) IS NULL;
-ERROR 42S22: Unknown column 'a' in 'field list'
+ERROR 42S22: Unknown column 'a' in 'SELECT'
 SELECT (SELECT 1) as a FROM (SELECT 1) b WHERE (SELECT a) IS NOT NULL;
-ERROR 42S22: Unknown column 'a' in 'field list'
+ERROR 42S22: Unknown column 'a' in 'SELECT'
 SELECT (SELECT 1,2,3) = ROW(1,2,3);
 (SELECT 1,2,3) = ROW(1,2,3)
 1
@@ -373,7 +373,7 @@ Warnings:
 Note	1276	Field or reference 'test.t6.clinic_uq' of SELECT #2 was resolved in SELECT #1
 Note	1003	/* select#1 */ select `test`.`t6`.`patient_uq` AS `patient_uq`,`test`.`t6`.`clinic_uq` AS `clinic_uq` from `test`.`t6` where <expr_cache><`test`.`t6`.`clinic_uq`>(<in_optimizer>(`test`.`t6`.`clinic_uq`,`test`.`t6`.`clinic_uq` in ( <materialize> (/* select#2 */ select `test`.`t7`.`uq` from `test`.`t7` where 1 ), <primary_index_lookup>(`test`.`t6`.`clinic_uq` in <temporary table> on distinct_key where `test`.`t6`.`clinic_uq` = `<subquery2>`.`uq`))))
 select * from t1 where a= (select a from t2,t4 where t2.b=t4.b);
-ERROR 23000: Column 'a' in field list is ambiguous
+ERROR 23000: Column 'a' in SELECT is ambiguous
 drop table t1,t2,t3;
 CREATE TABLE t3 (a varchar(20),b char(1) NOT NULL default '0');
 INSERT INTO t3 VALUES ('W','a'),('A','c'),('J','b');
@@ -484,9 +484,9 @@ numeropost	maxnumrep
 43506	2
 40143	1
 SELECT (SELECT 1) as a FROM (SELECT 1 FROM t1 HAVING a=1) b;
-ERROR 42S22: Unknown column 'a' in 'having clause'
+ERROR 42S22: Unknown column 'a' in 'HAVING'
 SELECT 1 IN (SELECT 1 FROM t2 HAVING a);
-ERROR 42S22: Unknown column 'a' in 'having clause'
+ERROR 42S22: Unknown column 'a' in 'HAVING'
 SELECT * from t2 where topic IN (SELECT topic FROM t2 GROUP BY topic);
 mot	topic	date	pseudo
 joce	40143	2002-10-22	joce
@@ -579,7 +579,7 @@ KEY `pseudo` (`pseudo`,`numeropost`)
 SELECT (SELECT numeropost FROM t1 HAVING numreponse=a),numreponse FROM (SELECT * FROM t1) as a;
 ERROR 42S22: Reference 'numreponse' not supported (forward reference in item list)
 SELECT numreponse, (SELECT numeropost FROM t1 HAVING numreponse=a) FROM (SELECT * FROM t1) as a;
-ERROR 42S22: Unknown column 'a' in 'having clause'
+ERROR 42S22: Unknown column 'a' in 'HAVING'
 SELECT numreponse, (SELECT numeropost FROM t1 HAVING numreponse=1) FROM (SELECT * FROM t1) as a;
 numreponse	(SELECT numeropost FROM t1 HAVING numreponse=1)
 INSERT INTO t1 (numeropost,numreponse,pseudo) VALUES (1,1,'joce'),(1,2,'joce'),(1,3,'test');
@@ -1407,7 +1407,7 @@ INSERT INTO t1 VALUES (1);
 UPDATE t1 SET i=i+(SELECT MAX(i) FROM (SELECT 1) t) WHERE i=(SELECT MAX(i));
 UPDATE t1 SET i=i+1 WHERE i=(SELECT MAX(i));
 UPDATE t1 SET t.i=i+(SELECT MAX(i) FROM (SELECT 1) t);
-ERROR 42S22: Unknown column 't.i' in 'field list'
+ERROR 42S22: Unknown column 't.i' in 'SET'
 select * from t1;
 i
 3
@@ -1611,7 +1611,7 @@ create table t2 (s1 int);
 insert into t1 values (1);
 insert into t2 values (1);
 update t1 set  s1 = s1 + 1 where 1 = (select x.s1 as A from t2 WHERE t2.s1 > t1.s1 order by A);
-ERROR 42S22: Unknown column 'x.s1' in 'field list'
+ERROR 42S22: Unknown column 'x.s1' in 'SELECT'
 DROP TABLE t1, t2;
 CREATE TABLE t1 (s1 CHAR(5) COLLATE latin1_german1_ci,
 s2 CHAR(5) COLLATE latin1_swedish_ci);
@@ -1845,11 +1845,11 @@ drop table t1, t2;
 create table t1 (s1 int);
 create table t2 (s1 int);
 select * from t1 where (select count(*) from t2 where t1.s2) = 1;
-ERROR 42S22: Unknown column 't1.s2' in 'where clause'
+ERROR 42S22: Unknown column 't1.s2' in 'WHERE'
 select * from t1 where (select count(*) from t2 group by t1.s2) = 1;
-ERROR 42S22: Unknown column 't1.s2' in 'group statement'
+ERROR 42S22: Unknown column 't1.s2' in 'GROUP BY'
 select count(*) from t2 group by t1.s2;
-ERROR 42S22: Unknown column 't1.s2' in 'group statement'
+ERROR 42S22: Unknown column 't1.s2' in 'GROUP BY'
 drop table t1, t2;
 CREATE TABLE t1(COLA FLOAT NOT NULL,COLB FLOAT NOT NULL,COLC VARCHAR(20) DEFAULT NULL,PRIMARY KEY (COLA, COLB));
 CREATE TABLE t2(COLA FLOAT NOT NULL,COLB FLOAT NOT NULL,COLC CHAR(1) NOT NULL,PRIMARY KEY (COLA));
@@ -2651,7 +2651,7 @@ INSERT INTO `t1` VALUES (1,0,0,700),(1,1,1,400),(1,5,5,400),(1,12,12,400),(1,12,
 CREATE TABLE `t2` ( `id` int(10) unsigned NOT NULL default '0', `pid` int(10) unsigned NOT NULL default '0', `map` smallint(6) unsigned NOT NULL default '0', `level` tinyint(4) unsigned NOT NULL default '0', `title` varchar(255) default NULL, PRIMARY KEY  (`id`,`pid`,`map`), KEY `level` (`level`), KEY `id` (`id`,`map`)) ;
 INSERT INTO `t2` VALUES (6,5,12,7,'a'),(12,0,0,7,'a'),(12,1,0,7,'a'),(12,5,5,7,'a'),(12,5,12,7,'a');
 SELECT b.sc FROM (SELECT (SELECT a.access FROM t1 a WHERE a.map = op.map AND a.slave = op.pid AND a.master = 1) ac FROM t2 op WHERE op.id = 12 AND op.map = 0) b;
-ERROR 42S22: Unknown column 'b.sc' in 'field list'
+ERROR 42S22: Unknown column 'b.sc' in 'SELECT'
 SELECT b.ac FROM (SELECT (SELECT a.access FROM t1 a WHERE a.map = op.map AND a.slave = op.pid AND a.master = 1) ac FROM t2 op WHERE op.id = 12 AND op.map = 0) b;
 ac
 700
@@ -2742,7 +2742,7 @@ drop table t1;
 create table t1 (a1 int);
 create table t2 (b1 int);
 select * from t1 where a2 > any(select b1 from t2);
-ERROR 42S22: Unknown column 'a2' in 'IN/ALL/ANY subquery'
+ERROR 42S22: Unknown column 'a2' in 'IN/ALL/ANY'
 select * from t1 where a1 > any(select b1 from t2);
 a1
 drop table t1,t2;
@@ -3664,11 +3664,11 @@ delete from t1 where c <= 1140006215 and (select b from t2 where a = 2) = 1;
 drop table t1, t2;
 CREATE TABLE t1 (a INT);
 CREATE VIEW v1 AS SELECT * FROM t1 WHERE no_such_column = ANY (SELECT 1);
-ERROR 42S22: Unknown column 'no_such_column' in 'IN/ALL/ANY subquery'
+ERROR 42S22: Unknown column 'no_such_column' in 'IN/ALL/ANY'
 CREATE VIEW v2 AS SELECT * FROM t1 WHERE no_such_column = (SELECT 1);
-ERROR 42S22: Unknown column 'no_such_column' in 'where clause'
+ERROR 42S22: Unknown column 'no_such_column' in 'WHERE'
 SELECT * FROM t1 WHERE no_such_column = ANY (SELECT 1);
-ERROR 42S22: Unknown column 'no_such_column' in 'IN/ALL/ANY subquery'
+ERROR 42S22: Unknown column 'no_such_column' in 'IN/ALL/ANY'
 DROP TABLE t1;
 create table t1 (i int, j bigint);
 insert into t1 values (1, 2), (2, 2), (3, 2);
@@ -4470,11 +4470,11 @@ EXPLAIN
 SELECT a AS out_a, MIN(b) FROM t1
 WHERE b > (SELECT MIN(b) FROM t1 WHERE a = out_a)
 GROUP BY a;
-ERROR 42S22: Unknown column 'out_a' in 'where clause'
+ERROR 42S22: Unknown column 'out_a' in 'WHERE'
 SELECT a AS out_a, MIN(b) FROM t1
 WHERE b > (SELECT MIN(b) FROM t1 WHERE a = out_a)
 GROUP BY a;
-ERROR 42S22: Unknown column 'out_a' in 'where clause'
+ERROR 42S22: Unknown column 'out_a' in 'WHERE'
 EXPLAIN
 SELECT a AS out_a, MIN(b) FROM t1 t1_outer
 WHERE b > (SELECT MIN(b) FROM t1 WHERE a = t1_outer.a)
@@ -5460,7 +5460,7 @@ INSERT INTO t1 VALUES (repeat('b',@@global.max_allowed_packet));
 EXPLAIN EXTENDED SELECT DISTINCT 1 FROM t1,
 (SELECT DISTINCTROW a AS away FROM t1 GROUP BY a WITH ROLLUP) AS d1  
 WHERE t1.a = d1.a;
-ERROR 42S22: Unknown column 'd1.a' in 'where clause'
+ERROR 42S22: Unknown column 'd1.a' in 'WHERE'
 DROP TABLE t1;
 Set up test tables.
 CREATE TABLE t1 (
diff --git a/mysql-test/main/subselect_sj2.result b/mysql-test/main/subselect_sj2.result
index 966d0f4c254..736a919cdd1 100644
--- a/mysql-test/main/subselect_sj2.result
+++ b/mysql-test/main/subselect_sj2.result
@@ -493,7 +493,7 @@ insert into t2 values(1,7503),(2,1);
 explain select count(*) 
 from t1 
 where fid IN (select fid from t2 where (id between 7502 and 8420) order by fid );
-ERROR 42S22: Unknown column 'fid' in 'IN/ALL/ANY subquery'
+ERROR 42S22: Unknown column 'fid' in 'IN/ALL/ANY'
 drop table t1, t2;
 create table t1 (a int, b int, key (a), key (b));
 insert into t1 values (2,4),(2,4),(2,4);
diff --git a/mysql-test/main/subselect_sj2_jcl6.result b/mysql-test/main/subselect_sj2_jcl6.result
index f6d127d89be..4d5518687f1 100644
--- a/mysql-test/main/subselect_sj2_jcl6.result
+++ b/mysql-test/main/subselect_sj2_jcl6.result
@@ -506,7 +506,7 @@ insert into t2 values(1,7503),(2,1);
 explain select count(*) 
 from t1 
 where fid IN (select fid from t2 where (id between 7502 and 8420) order by fid );
-ERROR 42S22: Unknown column 'fid' in 'IN/ALL/ANY subquery'
+ERROR 42S22: Unknown column 'fid' in 'IN/ALL/ANY'
 drop table t1, t2;
 create table t1 (a int, b int, key (a), key (b));
 insert into t1 values (2,4),(2,4),(2,4);
diff --git a/mysql-test/main/subselect_sj2_mat.result b/mysql-test/main/subselect_sj2_mat.result
index 1d654bba72c..13119b7410a 100644
--- a/mysql-test/main/subselect_sj2_mat.result
+++ b/mysql-test/main/subselect_sj2_mat.result
@@ -495,7 +495,7 @@ insert into t2 values(1,7503),(2,1);
 explain select count(*) 
 from t1 
 where fid IN (select fid from t2 where (id between 7502 and 8420) order by fid );
-ERROR 42S22: Unknown column 'fid' in 'IN/ALL/ANY subquery'
+ERROR 42S22: Unknown column 'fid' in 'IN/ALL/ANY'
 drop table t1, t2;
 create table t1 (a int, b int, key (a), key (b));
 insert into t1 values (2,4),(2,4),(2,4);
diff --git a/mysql-test/main/table_value_constr.result b/mysql-test/main/table_value_constr.result
index c17115c1043..44a5d49b8f2 100644
--- a/mysql-test/main/table_value_constr.result
+++ b/mysql-test/main/table_value_constr.result
@@ -2456,7 +2456,7 @@ NULL	UNION RESULT	<union1,2>	ALL	NULL	NULL	NULL	NULL	NULL	NULL	Using filesort
 Warnings:
 Note	1003	(/* select#1 */ select `tvc_0`.`5` AS `5` from (values (5),(7),(1),(3),(4)) `tvc_0` order by 1 limit 1,3) union all /* select#2 */ select 3 AS `3` order by 1 limit 1,2
 values (5,90), (7,20), (1,70), (3,50), (4,10) order by 3;
-ERROR 42S22: Unknown column '3' in 'order clause'
+ERROR 42S22: Unknown column '3' in 'ORDER BY'
 prepare stmt from "
 select 2 union (values (5), (7), (1), (3), (4) limit 2)
 ";
@@ -2532,7 +2532,7 @@ deallocate prepare stmt;
 prepare stmt from "
 values (5,90), (7,20), (1,70), (3,50), (4,10) order by 3;
 ";
-ERROR 42S22: Unknown column '3' in 'order clause'
+ERROR 42S22: Unknown column '3' in 'ORDER BY'
 create view v1 as values (5), (7), (1), (3), (4) order by 1 limit 2;
 show create view v1;
 View	Create View	character_set_client	collation_connection
@@ -2556,12 +2556,12 @@ select * from v1;
 3
 drop view v1;
 create view v1 as values (5,90), (7,20), (1,70), (3,50), (4,10) order by 3;
-ERROR 42S22: Unknown column '3' in 'order clause'
+ERROR 42S22: Unknown column '3' in 'ORDER BY'
 create view v1 as
 ( values (5), (7), (1), (3), (4) limit 2 offset 1 )
 union
 ( values (5), (7), (1), (3), (4) order by 2 limit 2 );
-ERROR 42S22: Unknown column '2' in 'order clause'
+ERROR 42S22: Unknown column '2' in 'ORDER BY'
 #
 # MDEV-20229: view defined as select using
 #             CTE with named columns defined as TVC
diff --git a/mysql-test/main/temp_table.result b/mysql-test/main/temp_table.result
index 61b78f96d4f..5c9ee845d72 100644
--- a/mysql-test/main/temp_table.result
+++ b/mysql-test/main/temp_table.result
@@ -576,7 +576,7 @@ DROP TABLE t1, t2;
 #
 CREATE TEMPORARY TABLE t1 (col1 BIGINT) ENGINE = InnoDB;
 INSERT INTO t1 (no_such_col) SELECT * FROM t1;
-ERROR 42S22: Unknown column 'no_such_col' in 'field list'
+ERROR 42S22: Unknown column 'no_such_col' in 'INSERT INTO'
 TRUNCATE TABLE t1;
 ALTER TABLE t1 CHANGE no_such_col1 col1 BIGINT NULL;
 ERROR 42S22: Unknown column 'no_such_col1' in 't1'
diff --git a/mysql-test/main/union.result b/mysql-test/main/union.result
index cd1c9022960..151ffdb4ad0 100644
--- a/mysql-test/main/union.result
+++ b/mysql-test/main/union.result
@@ -80,7 +80,7 @@ a	b
 2	b
 1	a
 (select a,b from t1 limit 2)  union all (select a,b from t2 order by a limit 1) order by t1.b;
-ERROR 42000: Table 't1' from one of the SELECTs cannot be used in order clause
+ERROR 42000: Table 't1' from one of the SELECTs cannot be used in ORDER BY
 explain extended (select a,b from t1 limit 2)  union all (select a,b from t2 order by a limit 1) order by b desc;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	PRIMARY	t1	ALL	NULL	NULL	NULL	NULL	4	100.00	
@@ -115,7 +115,7 @@ id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	PRIMARY	t1	ALL	NULL	NULL	NULL	NULL	4	
 2	UNION	t2	ALL	NULL	NULL	NULL	NULL	4	
 explain select xx from t1 union select 1;
-ERROR 42S22: Unknown column 'xx' in 'field list'
+ERROR 42S22: Unknown column 'xx' in 'SELECT'
 explain select a,b from t1 union select 1;
 ERROR 21000: The used SELECT statements have a different number of columns
 explain select 1 union select a,b from t1 union select 1;
@@ -148,13 +148,13 @@ select 1 as a,(select a union select a);
 a	(select a union select a)
 1	1
 (select 1) union (select 2) order by 0;
-ERROR 42S22: Unknown column '0' in 'order clause'
+ERROR 42S22: Unknown column '0' in 'ORDER BY'
 SELECT @a:=1 UNION SELECT @a:=@a+1;
 @a:=1
 1
 2
 (SELECT 1) UNION (SELECT 2) ORDER BY (SELECT a);
-ERROR 42S22: Unknown column 'a' in 'field list'
+ERROR 42S22: Unknown column 'a' in 'SELECT'
 (SELECT 1,3) UNION (SELECT 2,1) ORDER BY (SELECT 2);
 1	3
 1	3
@@ -493,7 +493,7 @@ drop temporary table t1;
 create table t1 select a from t1 union select a from t2;
 ERROR 42S01: Table 't1' already exists
 select a from t1 union select a from t2 order by t2.a;
-ERROR 42000: Table 't2' from one of the SELECTs cannot be used in order clause
+ERROR 42000: Table 't2' from one of the SELECTs cannot be used in ORDER BY
 drop table t1,t2;
 select length(version()) > 1 as `*` UNION select 2;
 *
@@ -1029,7 +1029,7 @@ set sql_select_limit=default;
 CREATE TABLE t1 (i int(11) default NULL,c char(1) default NULL,KEY i (i));
 CREATE TABLE t2 (i int(11) default NULL,c char(1) default NULL,KEY i (i));
 explain (select * from t1) union (select * from t2) order by not_existing_column;
-ERROR 42S22: Unknown column 'not_existing_column' in 'order clause'
+ERROR 42S22: Unknown column 'not_existing_column' in 'ORDER BY'
 drop table t1, t2;
 CREATE TABLE t1 (uid int(1));
 INSERT INTO t1 SELECT 150;
@@ -1529,7 +1529,7 @@ a
 3
 4
 SELECT a FROM (SELECT a FROM t1 UNION SELECT a FROM t1 ORDER BY c) AS test;
-ERROR 42S22: Unknown column 'c' in 'order clause'
+ERROR 42S22: Unknown column 'c' in 'ORDER BY'
 DROP TABLE t1;
 (select 1 into @var) union (select 1);
 ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'into @var) union (select 1)' at line 1
diff --git a/mysql-test/main/update.result b/mysql-test/main/update.result
index 7b6426d2ec5..9c91a4835fe 100644
--- a/mysql-test/main/update.result
+++ b/mysql-test/main/update.result
@@ -5,11 +5,11 @@ update t1 set a=a+10 where a > 34;
 update t1 set a=a+100 where a > 0;
 update t1 set a=a+100 where a=1 and a=2;
 update t1 set a=b+100 where a=1 and a=2;
-ERROR 42S22: Unknown column 'b' in 'field list'
+ERROR 42S22: Unknown column 'b' in 'SET'
 update t1 set a=b+100 where c=1 and a=2;
-ERROR 42S22: Unknown column 'c' in 'where clause'
+ERROR 42S22: Unknown column 'c' in 'WHERE'
 update t1 set d=a+100 where a=1;
-ERROR 42S22: Unknown column 'd' in 'field list'
+ERROR 42S22: Unknown column 'd' in 'SET'
 select * from t1;
 a
 101
@@ -399,7 +399,7 @@ update t1 set `*f2`=1;
 drop table t1;
 create table t1(f1 int);
 update t1 set f2=1 order by f2;
-ERROR 42S22: Unknown column 'f2' in 'order clause'
+ERROR 42S22: Unknown column 'f2' in 'ORDER BY'
 drop table t1;
 CREATE TABLE t1 (
 request_id int unsigned NOT NULL auto_increment,
diff --git a/mysql-test/main/update_use_source.result b/mysql-test/main/update_use_source.result
index 5a9e0a7750c..c0785c98fd6 100644
--- a/mysql-test/main/update_use_source.result
+++ b/mysql-test/main/update_use_source.result
@@ -1199,7 +1199,7 @@ create table t1 (c1 integer) engine=InnoDb;
 create table t2 (c1 integer) engine=InnoDb;
 create view v1 as select t1.c1 as "t1c1" ,t2.c1 as "t2c1" from t1,t2 where t1.c1=t2.c1;
 update v1 set t1c1=2 order by 1;
-ERROR 42S22: Unknown column '1' in 'order clause'
+ERROR 42S22: Unknown column '1' in 'ORDER BY'
 update v1 set t1c1=2 limit 1;
 drop table t1;
 drop table t2;
diff --git a/mysql-test/main/user_var.result b/mysql-test/main/user_var.result
index 26bf2853dd4..583f19b17ef 100644
--- a/mysql-test/main/user_var.result
+++ b/mysql-test/main/user_var.result
@@ -1,5 +1,5 @@
 set @a := foo;
-ERROR 42S22: Unknown column 'foo' in 'field list'
+ERROR 42S22: Unknown column 'foo' in 'SET'
 set @a := connection_id() + 3;
 select @a - connection_id();
 @a - connection_id()
diff --git a/mysql-test/main/varbinary.result b/mysql-test/main/varbinary.result
index ad8172bcfcd..d833aa11d8b 100644
--- a/mysql-test/main/varbinary.result
+++ b/mysql-test/main/varbinary.result
@@ -73,7 +73,7 @@ drop table t1;
 select x'hello';
 ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'x'hello'' at line 1
 select 0xfg;
-ERROR 42S22: Unknown column '0xfg' in 'field list'
+ERROR 42S22: Unknown column '0xfg' in 'SELECT'
 create table t1 select 1 as x, 2 as xx;
 select x,xx from t1;
 x	xx
@@ -178,6 +178,6 @@ x''	0+x''
 Warnings:
 Warning	1292	Truncated incorrect DOUBLE value: ''
 select 0x;
-ERROR 42S22: Unknown column '0x' in 'field list'
+ERROR 42S22: Unknown column '0x' in 'SELECT'
 select 0b;
-ERROR 42S22: Unknown column '0b' in 'field list'
+ERROR 42S22: Unknown column '0b' in 'SELECT'
diff --git a/mysql-test/main/variables.result b/mysql-test/main/variables.result
index 3f367ef4599..40fd69a321e 100644
--- a/mysql-test/main/variables.result
+++ b/mysql-test/main/variables.result
@@ -1765,7 +1765,7 @@ ERROR HY000: Unknown collation: '2048'
 set session rand_seed1=DEFAULT;
 ERROR 42000: Variable 'rand_seed1' doesn't have a default value
 set autocommit = value(v);
-ERROR 42S22: Unknown column 'v' in 'field list'
+ERROR 42S22: Unknown column 'v' in 'SET'
 set session sql_mode=ansi_quotes;
 select * from information_schema.session_variables where variable_name='sql_mode';
 VARIABLE_NAME	VARIABLE_VALUE
diff --git a/mysql-test/main/view.result b/mysql-test/main/view.result
index 58efbab2486..da0f3b16763 100644
--- a/mysql-test/main/view.result
+++ b/mysql-test/main/view.result
@@ -43,13 +43,13 @@ show create view t1;
 ERROR HY000: 'test.t1' is not of type 'VIEW'
 drop table t1;
 select a from v1;
-ERROR 42S22: Unknown column 'a' in 'field list'
+ERROR 42S22: Unknown column 'a' in 'SELECT'
 select v1.a from v1;
-ERROR 42S22: Unknown column 'v1.a' in 'field list'
+ERROR 42S22: Unknown column 'v1.a' in 'SELECT'
 select b from v1;
-ERROR 42S22: Unknown column 'b' in 'field list'
+ERROR 42S22: Unknown column 'b' in 'SELECT'
 select v1.b from v1;
-ERROR 42S22: Unknown column 'v1.b' in 'field list'
+ERROR 42S22: Unknown column 'v1.b' in 'SELECT'
 explain extended select c from v1;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	SIMPLE	t1	ALL	NULL	NULL	NULL	NULL	5	100.00	
@@ -73,9 +73,9 @@ id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 Warnings:
 Note	1003	/* select#1 */ select `v2`.`c` AS `c` from `test`.`v2`
 create view v3 (c) as select a+1 from v1;
-ERROR 42S22: Unknown column 'a' in 'field list'
+ERROR 42S22: Unknown column 'a' in 'SELECT'
 create view v3 (c) as select b+1 from v1;
-ERROR 42S22: Unknown column 'b' in 'field list'
+ERROR 42S22: Unknown column 'b' in 'SELECT'
 create view v3 (c) as select c+1 from v1;
 select c from v3;
 c
@@ -1586,7 +1586,7 @@ drop table t1;
 create table t1 (s1 int, s2 char);
 create view v1 as select s1, s2 from t1;
 select s2 from v1 vq1 where 2 = (select count(*) from v1 vq2 having vq1.s2 = vq2.s2);
-ERROR 42S22: Unknown column 'vq2.s2' in 'having clause'
+ERROR 42S22: Unknown column 'vq2.s2' in 'HAVING'
 select s2 from v1 vq1 where 2 = (select count(*) aa from v1 vq2 having vq1.s2 = aa);
 s2
 drop view v1;
@@ -2512,7 +2512,7 @@ blank
 not blank
 not blank
 Warnings:
-Warning	1052	Column 'x' in group statement is ambiguous
+Warning	1052	Column 'x' in GROUP BY is ambiguous
 SELECT IF(x IS NULL, 'blank', 'not blank') AS x FROM v1;
 x
 blank
@@ -2529,7 +2529,7 @@ blank
 not blank
 not blank
 Warnings:
-Warning	1052	Column 'x' in group statement is ambiguous
+Warning	1052	Column 'x' in GROUP BY is ambiguous
 DROP VIEW v1;
 DROP TABLE t1;
 drop table if exists t1;
@@ -6021,7 +6021,7 @@ f1	f2
 1	20
 drop table t1, t2;
 SELECT 1 FROM (SELECT 1 as a) AS b HAVING (SELECT `SOME_GARBAGE`.b.a)=1;
-ERROR 42S22: Unknown column 'SOME_GARBAGE.b.a' in 'field list'
+ERROR 42S22: Unknown column 'SOME_GARBAGE.b.a' in 'SELECT'
 #
 # MDEV-10035: DBUG_ASSERT on CREATE VIEW v1 AS SELECT * FROM t1
 # FOR UPDATE
@@ -6936,11 +6936,11 @@ CREATE TABLE t2 (b int);
 INSERT INTO t2 VALUES (2),(3);
 CREATE TABLE t3 (c int);
 CREATE VIEW v1 AS SELECT * FROM t1 JOIN t2 ON t1.x > t2.b;
-ERROR 42S22: Unknown column 't1.x' in 'on clause'
+ERROR 42S22: Unknown column 't1.x' in 'ON'
 INSERT INTO t3 SELECT * FROM t1 JOIN t2 ON t1.x > t2.b;
-ERROR 42S22: Unknown column 't1.x' in 'on clause'
+ERROR 42S22: Unknown column 't1.x' in 'ON'
 CREATE TABLE t4 AS SELECT * FROM t1 JOIN t2 ON t1.x > t2.b;
-ERROR 42S22: Unknown column 't1.x' in 'on clause'
+ERROR 42S22: Unknown column 't1.x' in 'ON'
 DROP TABLE t1,t2,t3;
 #
 # MDEV-29088: view specification contains unknown column in ON condition
@@ -6950,10 +6950,10 @@ create table t2 (b int);
 create table t3 (c int);
 create view v as
 select * from t1 left join t2 on t1.a=t2.b and t1.a in (select d from t3);
-ERROR 42S22: Unknown column 'd' in 'field list'
+ERROR 42S22: Unknown column 'd' in 'SELECT'
 create algorithm=merge view v as
 select * from t1 left join t2 on t1.a=t2.b and t1.a in (select d from t3);
-ERROR 42S22: Unknown column 'd' in 'field list'
+ERROR 42S22: Unknown column 'd' in 'SELECT'
 drop table t1,t2,t3;
 #
 # MDEV-31189: Server crash or assertion failure in upon 2nd
diff --git a/mysql-test/suite/compat/oracle/r/anonymous_derived.result b/mysql-test/suite/compat/oracle/r/anonymous_derived.result
index 6b482d7bdcc..8095d0d10a3 100644
--- a/mysql-test/suite/compat/oracle/r/anonymous_derived.result
+++ b/mysql-test/suite/compat/oracle/r/anonymous_derived.result
@@ -42,7 +42,7 @@ id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 Warnings:
 Note	1003	/* select#1 */ select "test"."t1"."a" AS "a","__2"."b" AS "b" from "test"."t1" join (/* select#2 */ select max("test"."t2"."a") AS "b" from "test"."t2") "__2"
 select * from (select tt.* from (select * from t1) as tt) where tt.a > 0;
-ERROR 42S22: Unknown column 'tt.a' in 'where clause'
+ERROR 42S22: Unknown column 'tt.a' in 'WHERE'
 select * from (select tt.* from (select * from t1) as tt) where a > 0;
 a
 2
diff --git a/mysql-test/suite/compat/oracle/r/func_misc.result b/mysql-test/suite/compat/oracle/r/func_misc.result
index 28f27873415..76b30971595 100644
--- a/mysql-test/suite/compat/oracle/r/func_misc.result
+++ b/mysql-test/suite/compat/oracle/r/func_misc.result
@@ -6,9 +6,9 @@ SET sql_mode=ORACLE;
 # Using SQLCODE and SQLERRM outside of an SP
 #
 SELECT SQLCODE;
-ERROR 42S22: Unknown column 'SQLCODE' in 'field list'
+ERROR 42S22: Unknown column 'SQLCODE' in 'SELECT'
 SELECT SQLERRM;
-ERROR 42S22: Unknown column 'SQLERRM' in 'field list'
+ERROR 42S22: Unknown column 'SQLERRM' in 'SELECT'
 CREATE TABLE t1 (SQLCODE INT, SQLERRM VARCHAR(10));
 INSERT INTO t1 VALUES (10, 'test');
 SELECT SQLCODE, SQLERRM FROM t1;
diff --git a/mysql-test/suite/compat/oracle/r/ps.result b/mysql-test/suite/compat/oracle/r/ps.result
index 2d0c4da9554..87f280a3e1e 100644
--- a/mysql-test/suite/compat/oracle/r/ps.result
+++ b/mysql-test/suite/compat/oracle/r/ps.result
@@ -186,9 +186,9 @@ ERROR 42000: EXECUTE IMMEDIATE does not support subqueries or stored functions
 PREPARE stmt FROM (SELECT 'SELECT 1');
 ERROR 42000: PREPARE..FROM does not support subqueries or stored functions
 EXECUTE IMMEDIATE a;
-ERROR 42S22: Unknown column 'a' in 'field list'
+ERROR 42S22: Unknown column 'a' in 'EXECUTE IMMEDIATE'
 PREPARE stmt FROM a;
-ERROR 42S22: Unknown column 'a' in 'field list'
+ERROR 42S22: Unknown column 'a' in 'PREPARE..FROM'
 EXECUTE IMMEDIATE NULL;
 ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'NULL' at line 1
 PREPARE stmt FROM NULL;
diff --git a/mysql-test/suite/compat/oracle/r/sp-cursor-rowtype.result b/mysql-test/suite/compat/oracle/r/sp-cursor-rowtype.result
index 93300cc375b..34760f64735 100644
--- a/mysql-test/suite/compat/oracle/r/sp-cursor-rowtype.result
+++ b/mysql-test/suite/compat/oracle/r/sp-cursor-rowtype.result
@@ -1200,7 +1200,7 @@ END LOOP;
 END;
 $$
 CALL p1;
-ERROR 42S22: Unknown column 'rec' in 'field list'
+ERROR 42S22: Unknown column 'rec' in 'SELECT'
 DROP PROCEDURE p1;
 CREATE PROCEDURE p1 AS
 BEGIN
@@ -1211,7 +1211,7 @@ END LOOP;
 END;
 $$
 CALL p1;
-ERROR 42S02: Unknown table 'rec' in field list
+ERROR 42S02: Unknown table 'rec' in SELECT
 DROP PROCEDURE p1;
 # Totally confusing name mixture
 CREATE TABLE rec (rec INT);
diff --git a/mysql-test/suite/compat/oracle/r/table_value_constr.result b/mysql-test/suite/compat/oracle/r/table_value_constr.result
index 365edaa7757..f747f95550f 100644
--- a/mysql-test/suite/compat/oracle/r/table_value_constr.result
+++ b/mysql-test/suite/compat/oracle/r/table_value_constr.result
@@ -2450,7 +2450,7 @@ NULL	UNION RESULT	<union1,2>	ALL	NULL	NULL	NULL	NULL	NULL	NULL	Using filesort
 Warnings:
 Note	1003	(/* select#1 */ select "tvc_0"."5" AS "5" from (values (5),(7),(1),(3),(4)) "tvc_0" order by 1 limit 1,3) union all /* select#2 */ select 3 AS "3" order by 1 limit 1,2
 values (5,90), (7,20), (1,70), (3,50), (4,10) order by 3;
-ERROR 42S22: Unknown column '3' in 'order clause'
+ERROR 42S22: Unknown column '3' in 'ORDER BY'
 create view v1 as values (5), (7), (1), (3), (4) order by 1 limit 2;
 show create view v1;
 View	Create View	character_set_client	collation_connection
@@ -2474,9 +2474,9 @@ select * from v1;
 3
 drop view v1;
 create view v1 as values (5,90), (7,20), (1,70), (3,50), (4,10) order by 3;
-ERROR 42S22: Unknown column '3' in 'order clause'
+ERROR 42S22: Unknown column '3' in 'ORDER BY'
 create view v1 as
 ( values (5), (7), (1), (3), (4) limit 2 offset 1 )
 union
 ( values (5), (7), (1), (3), (4) order by 2 limit 2 );
-ERROR 42S22: Unknown column '2' in 'order clause'
+ERROR 42S22: Unknown column '2' in 'ORDER BY'
diff --git a/mysql-test/suite/funcs_1/r/innodb_views.result b/mysql-test/suite/funcs_1/r/innodb_views.result
index 90d72b451b9..c333b96bdac 100644
--- a/mysql-test/suite/funcs_1/r/innodb_views.result
+++ b/mysql-test/suite/funcs_1/r/innodb_views.result
@@ -4209,14 +4209,14 @@ Create view v1_1
 as Select test.tb2.f59 as NewNameF1, test.tb2.f60 as NewNameF2
 from tb2 limit 0,100 ;
 SELECT NewNameF1,f60             FROM test.v1_1 ;
-ERROR 42S22: Unknown column 'f60' in 'field list'
+ERROR 42S22: Unknown column 'f60' in 'SELECT'
 SELECT NewNameF1, v1_1.f60 FROM test.v1_1 ;
-ERROR 42S22: Unknown column 'v1_1.f60' in 'field list'
+ERROR 42S22: Unknown column 'v1_1.f60' in 'SELECT'
 SELECT f59, f60 FROM test.v1 ;
-ERROR 42S22: Unknown column 'f59' in 'field list'
+ERROR 42S22: Unknown column 'f59' in 'SELECT'
 Use test ;
 SELECT F59 FROM v1 ;
-ERROR 42S22: Unknown column 'F59' in 'field list'
+ERROR 42S22: Unknown column 'F59' in 'SELECT'
 
 Testcase 3.3.1.19 
 --------------------------------------------------------------------------------
@@ -22453,7 +22453,7 @@ INSERT INTO t1 SET f1 = 0, f4x = 'ABC', report = 't1 1';
 INSERT INTO v1 SET f1 = 0, f4  = 'ABC', report = 'v1 1';
 ERROR HY000: View 'test.v1' references invalid table(s) or column(s) or function(s) or definer/invoker of view lack rights to use them
 INSERT INTO v1 SET f1 = 0, f4x = 'ABC', report = 'v1 1a';
-ERROR 42S22: Unknown column 'f4x' in 'field list'
+ERROR 42S22: Unknown column 'f4x' in 'INSERT INTO'
 INSERT INTO v1 SET f1 = 0, report = 'v1 1b';
 ERROR HY000: View 'test.v1' references invalid table(s) or column(s) or function(s) or definer/invoker of view lack rights to use them
 DESCRIBE t1;
@@ -22756,7 +22756,7 @@ INSERT INTO t1 SET f1 = 'ABC', f2 = -3.3E-4,
 f3 = -2.2, f4 = '<------ 20 -------->', report = 't1 9';
 INSERT INTO v1 SET f1 = 'ABC', f2 = -3.3E-4,
 f3 = -2.2, f4 = '<------ 20 -------->', report = 'v1 9';
-ERROR 42S22: Unknown column 'f3' in 'field list'
+ERROR 42S22: Unknown column 'f3' in 'INSERT INTO'
 INSERT INTO v1 SET f1 = 'ABC', f2 = -3.3E-4,
 f4 = '<------ 20 -------->', report = 'v1 9a';
 DESCRIBE t1;
diff --git a/mysql-test/suite/funcs_1/r/is_column_privileges.result b/mysql-test/suite/funcs_1/r/is_column_privileges.result
index 3e64f217c74..10aa8128d89 100644
--- a/mysql-test/suite/funcs_1/r/is_column_privileges.result
+++ b/mysql-test/suite/funcs_1/r/is_column_privileges.result
@@ -261,7 +261,7 @@ GRANT USAGE ON *.* TO `testuser1`@`localhost`
 GRANT ALL PRIVILEGES ON `test`.* TO `testuser1`@`localhost`
 GRANT SELECT (`f3`, `f1`), UPDATE (`f1`) ON `db_datadict`.`my_table` TO `testuser1`@`localhost`
 SELECT f1, f3 FROM db_datadict.my_table;
-ERROR 42S22: Unknown column 'f3' in 'field list'
+ERROR 42S22: Unknown column 'f3' in 'SELECT'
 connection default;
 ALTER TABLE db_datadict.my_table CHANGE COLUMN f1 my_col BIGINT;
 SELECT * FROM information_schema.column_privileges
diff --git a/mysql-test/suite/funcs_1/r/memory_views.result b/mysql-test/suite/funcs_1/r/memory_views.result
index 417c0e85188..75d321daad9 100644
--- a/mysql-test/suite/funcs_1/r/memory_views.result
+++ b/mysql-test/suite/funcs_1/r/memory_views.result
@@ -4210,14 +4210,14 @@ Create view v1_1
 as Select test.tb2.f59 as NewNameF1, test.tb2.f60 as NewNameF2
 from tb2 limit 0,100 ;
 SELECT NewNameF1,f60             FROM test.v1_1 ;
-ERROR 42S22: Unknown column 'f60' in 'field list'
+ERROR 42S22: Unknown column 'f60' in 'SELECT'
 SELECT NewNameF1, v1_1.f60 FROM test.v1_1 ;
-ERROR 42S22: Unknown column 'v1_1.f60' in 'field list'
+ERROR 42S22: Unknown column 'v1_1.f60' in 'SELECT'
 SELECT f59, f60 FROM test.v1 ;
-ERROR 42S22: Unknown column 'f59' in 'field list'
+ERROR 42S22: Unknown column 'f59' in 'SELECT'
 Use test ;
 SELECT F59 FROM v1 ;
-ERROR 42S22: Unknown column 'F59' in 'field list'
+ERROR 42S22: Unknown column 'F59' in 'SELECT'
 
 Testcase 3.3.1.19 
 --------------------------------------------------------------------------------
@@ -22455,7 +22455,7 @@ INSERT INTO t1 SET f1 = 0, f4x = 'ABC', report = 't1 1';
 INSERT INTO v1 SET f1 = 0, f4  = 'ABC', report = 'v1 1';
 ERROR HY000: View 'test.v1' references invalid table(s) or column(s) or function(s) or definer/invoker of view lack rights to use them
 INSERT INTO v1 SET f1 = 0, f4x = 'ABC', report = 'v1 1a';
-ERROR 42S22: Unknown column 'f4x' in 'field list'
+ERROR 42S22: Unknown column 'f4x' in 'INSERT INTO'
 INSERT INTO v1 SET f1 = 0, report = 'v1 1b';
 ERROR HY000: View 'test.v1' references invalid table(s) or column(s) or function(s) or definer/invoker of view lack rights to use them
 DESCRIBE t1;
@@ -22758,7 +22758,7 @@ INSERT INTO t1 SET f1 = 'ABC', f2 = -3.3E-4,
 f3 = -2.2, f4 = '<------ 20 -------->', report = 't1 9';
 INSERT INTO v1 SET f1 = 'ABC', f2 = -3.3E-4,
 f3 = -2.2, f4 = '<------ 20 -------->', report = 'v1 9';
-ERROR 42S22: Unknown column 'f3' in 'field list'
+ERROR 42S22: Unknown column 'f3' in 'INSERT INTO'
 INSERT INTO v1 SET f1 = 'ABC', f2 = -3.3E-4,
 f4 = '<------ 20 -------->', report = 'v1 9a';
 DESCRIBE t1;
diff --git a/mysql-test/suite/funcs_1/r/myisam_views-big.result b/mysql-test/suite/funcs_1/r/myisam_views-big.result
index efd5ee1c568..cccef2fde7e 100644
--- a/mysql-test/suite/funcs_1/r/myisam_views-big.result
+++ b/mysql-test/suite/funcs_1/r/myisam_views-big.result
@@ -4679,14 +4679,14 @@ Create view v1_1
 as Select test.tb2.f59 as NewNameF1, test.tb2.f60 as NewNameF2
 from tb2 limit 0,100 ;
 SELECT NewNameF1,f60             FROM test.v1_1 ;
-ERROR 42S22: Unknown column 'f60' in 'field list'
+ERROR 42S22: Unknown column 'f60' in 'SELECT'
 SELECT NewNameF1, v1_1.f60 FROM test.v1_1 ;
-ERROR 42S22: Unknown column 'v1_1.f60' in 'field list'
+ERROR 42S22: Unknown column 'v1_1.f60' in 'SELECT'
 SELECT f59, f60 FROM test.v1 ;
-ERROR 42S22: Unknown column 'f59' in 'field list'
+ERROR 42S22: Unknown column 'f59' in 'SELECT'
 Use test ;
 SELECT F59 FROM v1 ;
-ERROR 42S22: Unknown column 'F59' in 'field list'
+ERROR 42S22: Unknown column 'F59' in 'SELECT'
 
 Testcase 3.3.1.19 
 --------------------------------------------------------------------------------
@@ -24157,7 +24157,7 @@ INSERT INTO t1 SET f1 = 0, f4x = 'ABC', report = 't1 1';
 INSERT INTO v1 SET f1 = 0, f4  = 'ABC', report = 'v1 1';
 ERROR HY000: View 'test.v1' references invalid table(s) or column(s) or function(s) or definer/invoker of view lack rights to use them
 INSERT INTO v1 SET f1 = 0, f4x = 'ABC', report = 'v1 1a';
-ERROR 42S22: Unknown column 'f4x' in 'field list'
+ERROR 42S22: Unknown column 'f4x' in 'INSERT INTO'
 INSERT INTO v1 SET f1 = 0, report = 'v1 1b';
 ERROR HY000: View 'test.v1' references invalid table(s) or column(s) or function(s) or definer/invoker of view lack rights to use them
 DESCRIBE t1;
@@ -24460,7 +24460,7 @@ INSERT INTO t1 SET f1 = 'ABC', f2 = -3.3E-4,
 f3 = -2.2, f4 = '<------ 20 -------->', report = 't1 9';
 INSERT INTO v1 SET f1 = 'ABC', f2 = -3.3E-4,
 f3 = -2.2, f4 = '<------ 20 -------->', report = 'v1 9';
-ERROR 42S22: Unknown column 'f3' in 'field list'
+ERROR 42S22: Unknown column 'f3' in 'INSERT INTO'
 INSERT INTO v1 SET f1 = 'ABC', f2 = -3.3E-4,
 f4 = '<------ 20 -------->', report = 'v1 9a';
 DESCRIBE t1;
diff --git a/mysql-test/suite/funcs_1/r/storedproc.result b/mysql-test/suite/funcs_1/r/storedproc.result
index 3d33181c121..45bcc882f3c 100644
--- a/mysql-test/suite/funcs_1/r/storedproc.result
+++ b/mysql-test/suite/funcs_1/r/storedproc.result
@@ -3893,7 +3893,7 @@ SELECT count(*) into cnt from t2;
 set @count = cnt;
 SELECT @count;
 END//
-ERROR 42S22: Unknown column 'cnt' in 'field list'
+ERROR 42S22: Unknown column 'cnt' in 'SET'
 CALL sp1( 10 );
 DROP PROCEDURE sp1;
 CREATE PROCEDURE sp1( cnt int(20) )
@@ -15599,7 +15599,7 @@ END;
 END loop label1;
 END//
 CALL sp4();
-ERROR 42S22: Unknown column 'idummy2' in 'field list'
+ERROR 42S22: Unknown column 'idummy2' in 'SELECT'
 DROP PROCEDURE sp4;
 
 Testcase 4.3.5:
diff --git a/mysql-test/suite/handler/aria.result b/mysql-test/suite/handler/aria.result
index b0a4a173289..ce40d8dd9fe 100644
--- a/mysql-test/suite/handler/aria.result
+++ b/mysql-test/suite/handler/aria.result
@@ -400,7 +400,7 @@ create table t1(a int, index using btree (a));
 insert into t1 values (1), (2), (3);
 handler t1 open;
 handler t1 read a=(W);
-ERROR 42S22: Unknown column 'W' in 'field list'
+ERROR 42S22: Unknown column 'W' in 'HANDLER ... READ'
 handler t1 read a=(a);
 ERROR HY000: Incorrect arguments to HANDLER ... READ
 drop table t1;
@@ -597,11 +597,11 @@ handler t1 open as t1_alias;
 handler t1_alias read a next;
 ERROR 42000: Key 'a' doesn't exist in table 't1_alias'
 handler t1_alias READ a next where inexistent > 0;
-ERROR 42S22: Unknown column 'inexistent' in 'field list'
+ERROR 42S22: Unknown column 'inexistent' in 'WHERE'
 handler t1_alias read a next;
 ERROR 42000: Key 'a' doesn't exist in table 't1_alias'
 handler t1_alias READ a next where inexistent > 0;
-ERROR 42S22: Unknown column 'inexistent' in 'field list'
+ERROR 42S22: Unknown column 'inexistent' in 'WHERE'
 handler t1_alias close;
 drop table t1;
 create temporary table t1 (a int, b char(1), key a using btree (a), key b using btree (a,b));
diff --git a/mysql-test/suite/handler/heap.result b/mysql-test/suite/handler/heap.result
index e66bccb1341..65a10dc5257 100644
--- a/mysql-test/suite/handler/heap.result
+++ b/mysql-test/suite/handler/heap.result
@@ -400,7 +400,7 @@ create table t1(a int, index using btree (a));
 insert into t1 values (1), (2), (3);
 handler t1 open;
 handler t1 read a=(W);
-ERROR 42S22: Unknown column 'W' in 'field list'
+ERROR 42S22: Unknown column 'W' in 'HANDLER ... READ'
 handler t1 read a=(a);
 ERROR HY000: Incorrect arguments to HANDLER ... READ
 drop table t1;
@@ -597,11 +597,11 @@ handler t1 open as t1_alias;
 handler t1_alias read a next;
 ERROR 42000: Key 'a' doesn't exist in table 't1_alias'
 handler t1_alias READ a next where inexistent > 0;
-ERROR 42S22: Unknown column 'inexistent' in 'field list'
+ERROR 42S22: Unknown column 'inexistent' in 'WHERE'
 handler t1_alias read a next;
 ERROR 42000: Key 'a' doesn't exist in table 't1_alias'
 handler t1_alias READ a next where inexistent > 0;
-ERROR 42S22: Unknown column 'inexistent' in 'field list'
+ERROR 42S22: Unknown column 'inexistent' in 'WHERE'
 handler t1_alias close;
 drop table t1;
 create temporary table t1 (a int, b char(1), key a using btree (a), key b using btree (a,b));
diff --git a/mysql-test/suite/handler/innodb.result b/mysql-test/suite/handler/innodb.result
index 5d44642db01..22426da0481 100644
--- a/mysql-test/suite/handler/innodb.result
+++ b/mysql-test/suite/handler/innodb.result
@@ -400,7 +400,7 @@ create table t1(a int, index using btree (a));
 insert into t1 values (1), (2), (3);
 handler t1 open;
 handler t1 read a=(W);
-ERROR 42S22: Unknown column 'W' in 'field list'
+ERROR 42S22: Unknown column 'W' in 'HANDLER ... READ'
 handler t1 read a=(a);
 ERROR HY000: Incorrect arguments to HANDLER ... READ
 drop table t1;
@@ -598,11 +598,11 @@ handler t1 open as t1_alias;
 handler t1_alias read a next;
 ERROR 42000: Key 'a' doesn't exist in table 't1_alias'
 handler t1_alias READ a next where inexistent > 0;
-ERROR 42S22: Unknown column 'inexistent' in 'field list'
+ERROR 42S22: Unknown column 'inexistent' in 'WHERE'
 handler t1_alias read a next;
 ERROR 42000: Key 'a' doesn't exist in table 't1_alias'
 handler t1_alias READ a next where inexistent > 0;
-ERROR 42S22: Unknown column 'inexistent' in 'field list'
+ERROR 42S22: Unknown column 'inexistent' in 'WHERE'
 handler t1_alias close;
 drop table t1;
 create temporary table t1 (a int, b char(1), key a using btree (a), key b using btree (a,b));
diff --git a/mysql-test/suite/handler/myisam.result b/mysql-test/suite/handler/myisam.result
index cc817ccd889..37ffea6fa0f 100644
--- a/mysql-test/suite/handler/myisam.result
+++ b/mysql-test/suite/handler/myisam.result
@@ -400,7 +400,7 @@ create table t1(a int, index using btree (a));
 insert into t1 values (1), (2), (3);
 handler t1 open;
 handler t1 read a=(W);
-ERROR 42S22: Unknown column 'W' in 'field list'
+ERROR 42S22: Unknown column 'W' in 'HANDLER ... READ'
 handler t1 read a=(a);
 ERROR HY000: Incorrect arguments to HANDLER ... READ
 drop table t1;
@@ -597,11 +597,11 @@ handler t1 open as t1_alias;
 handler t1_alias read a next;
 ERROR 42000: Key 'a' doesn't exist in table 't1_alias'
 handler t1_alias READ a next where inexistent > 0;
-ERROR 42S22: Unknown column 'inexistent' in 'field list'
+ERROR 42S22: Unknown column 'inexistent' in 'WHERE'
 handler t1_alias read a next;
 ERROR 42000: Key 'a' doesn't exist in table 't1_alias'
 handler t1_alias READ a next where inexistent > 0;
-ERROR 42S22: Unknown column 'inexistent' in 'field list'
+ERROR 42S22: Unknown column 'inexistent' in 'WHERE'
 handler t1_alias close;
 drop table t1;
 create temporary table t1 (a int, b char(1), key a using btree (a), key b using btree (a,b));
diff --git a/mysql-test/suite/innodb/r/innodb.result b/mysql-test/suite/innodb/r/innodb.result
index 60bf11d9e0d..145f63fd222 100644
--- a/mysql-test/suite/innodb/r/innodb.result
+++ b/mysql-test/suite/innodb/r/innodb.result
@@ -1305,7 +1305,7 @@ ERROR 23000: Cannot delete or update a parent row: a foreign key constraint fail
 update t1,t2,t3 set t3.id=5, t2.id=6, t1.id=7  where t1.id =1 and t2.id = t1.id and t3.id = t2.id;
 ERROR 23000: Cannot delete or update a parent row: a foreign key constraint fails (`test`.`t2`, CONSTRAINT `t1_id_fk` FOREIGN KEY (`id`) REFERENCES `t1` (`id`))
 update t3 set  t3.id=7  where t1.id =1 and t2.id = t1.id and t3.id = t2.id;
-ERROR 42S22: Unknown column 't1.id' in 'where clause'
+ERROR 42S22: Unknown column 't1.id' in 'WHERE'
 drop table t3,t2,t1;
 CREATE TABLE t1 (
 c1 VARCHAR(8), c2 VARCHAR(8),
diff --git a/mysql-test/suite/innodb/r/innodb_mysql.result b/mysql-test/suite/innodb/r/innodb_mysql.result
index 9d8ead7a165..c3f18e48c51 100644
--- a/mysql-test/suite/innodb/r/innodb_mysql.result
+++ b/mysql-test/suite/innodb/r/innodb_mysql.result
@@ -2553,7 +2553,7 @@ INSERT INTO t1 VALUES (1),(2),(3),(4);
 INSERT INTO t3 SELECT * FROM t1;
 ** An error in a trigger causes rollback of the statement.
 DELETE t1 FROM t3 LEFT JOIN t1 ON t1.i=t3.i;
-ERROR 42S22: Unknown column 'error_happens_here' in 'field list'
+ERROR 42S22: Unknown column 'error_happens_here' in 'SET'
 SELECT @a,@b;
 @a	@b
 	EXECUTED TRIGGER
@@ -2567,7 +2567,7 @@ i	i
 4	4
 ** Same happens with the IGNORE option
 DELETE IGNORE t1 FROM t3 LEFT JOIN t1 ON t1.i=t3.i;
-ERROR 42S22: Unknown column 'error_happens_here' in 'field list'
+ERROR 42S22: Unknown column 'error_happens_here' in 'SET'
 SELECT * FROM t2;
 a
 SELECT * FROM t1 LEFT JOIN t3 ON t1.i=t3.i;
diff --git a/mysql-test/suite/innodb/r/temporary_table_optimization.result b/mysql-test/suite/innodb/r/temporary_table_optimization.result
index e2e9131b09d..9fc6449a645 100644
--- a/mysql-test/suite/innodb/r/temporary_table_optimization.result
+++ b/mysql-test/suite/innodb/r/temporary_table_optimization.result
@@ -151,7 +151,7 @@ t1	CREATE TEMPORARY TABLE `t1` (
   UNIQUE KEY `pri_index` (`t1_i`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 select * from t1 where t1_f >= 2.5;
-ERROR 42S22: Unknown column 't1_f' in 'where clause'
+ERROR 42S22: Unknown column 't1_f' in 'WHERE'
 alter table t1 add index sec_index2(t1_c), algorithm=inplace;
 ERROR 0A000: ALGORITHM=INPLACE is not supported for this operation. Try ALGORITHM=COPY
 drop table t1;
diff --git a/mysql-test/suite/innodb_fts/r/fulltext.result b/mysql-test/suite/innodb_fts/r/fulltext.result
index 32dc87daa04..e638b45d4b1 100644
--- a/mysql-test/suite/innodb_fts/r/fulltext.result
+++ b/mysql-test/suite/innodb_fts/r/fulltext.result
@@ -641,9 +641,9 @@ ERROR 42000: syntax error, unexpected $end, expecting FTS_TERM or FTS_NUMB or '*
 SELECT 1 FROM q WHERE (SELECT MATCH(b) AGAINST ('*') FROM z);
 ERROR 42000: syntax error, unexpected $end, expecting FTS_TERM or FTS_NUMB or '*'
 EXPLAIN SELECT MATCH(b) AGAINST ('*') FROM z;
-ERROR 42S22: Unknown column 'b' in 'field list'
+ERROR 42S22: Unknown column 'b' in 'SELECT'
 SELECT MATCH(b) AGAINST ('*') FROM z;
-ERROR 42S22: Unknown column 'b' in 'field list'
+ERROR 42S22: Unknown column 'b' in 'SELECT'
 EXPLAIN SELECT MATCH(a) AGAINST ('*') FROM z;
 ERROR HY000: Can't find FULLTEXT index matching the column list
 SELECT MATCH(a) AGAINST ('*') FROM z;
diff --git a/mysql-test/suite/innodb_fts/r/fulltext_order_by.result b/mysql-test/suite/innodb_fts/r/fulltext_order_by.result
index 02142016d40..a09fc6929dd 100644
--- a/mysql-test/suite/innodb_fts/r/fulltext_order_by.result
+++ b/mysql-test/suite/innodb_fts/r/fulltext_order_by.result
@@ -129,7 +129,7 @@ group by
 a.text, b.id, b.betreff
 order by 
 match(b.betreff) against ('+abc' in boolean mode) desc;
-ERROR 42000: Table 'b' from one of the SELECTs cannot be used in order clause
+ERROR 42000: Table 'b' from one of the SELECTs cannot be used in ORDER BY
 select a.text, b.id, b.betreff
 from 
 t2 a inner join t3 b on a.id = b.forum inner join
@@ -145,7 +145,7 @@ where
 match(c.beitrag) against ('+abc' in boolean mode)
 order by 
 match(b.betreff) against ('+abc' in boolean mode) desc;
-ERROR 42000: Table 'b' from one of the SELECTs cannot be used in order clause
+ERROR 42000: Table 'b' from one of the SELECTs cannot be used in ORDER BY
 select a.text, b.id, b.betreff
 from 
 t2 a inner join t3 b on a.id = b.forum inner join
diff --git a/mysql-test/suite/json/r/json_no_table.result b/mysql-test/suite/json/r/json_no_table.result
index c7dd32fcd1a..77c134a2b4b 100644
--- a/mysql-test/suite/json/r/json_no_table.result
+++ b/mysql-test/suite/json/r/json_no_table.result
@@ -2473,7 +2473,7 @@ NULL
 Warnings:
 Warning	4042	Syntax error in JSON path in argument 6 to function 'json_search' at position 2
 select json_search(a, b, c);
-ERROR 42S22: Unknown column 'a' in 'field list'
+ERROR 42S22: Unknown column 'a' in 'SELECT'
 select json_search( '{ "a": "foobar" }', 'one', 'foo%' );
 json_search( '{ "a": "foobar" }', 'one', 'foo%' )
 "$.a"
diff --git a/mysql-test/suite/json/r/json_table.result b/mysql-test/suite/json/r/json_table.result
index 2260b8c1f55..fec71b37058 100644
--- a/mysql-test/suite/json/r/json_table.result
+++ b/mysql-test/suite/json/r/json_table.result
@@ -43,7 +43,7 @@ j2	[{"a": 3, "b": [11,111]}, {"a": 4, "b": [22,222]}, {"a": 5, "b": [22,222]}]	2
 j2	[{"a": 3, "b": [11,111]}, {"a": 4, "b": [22,222]}, {"a": 5, "b": [22,222]}]	3	5	1	22
 j2	[{"a": 3, "b": [11,111]}, {"a": 4, "b": [22,222]}, {"a": 5, "b": [22,222]}]	3	5	2	222
 select * from t1, JSON_TABLE(t1.no_field, '$[*]' COLUMNS(js_id FOR ORDINALITY, a INT PATH '$.a', NESTED PATH '$.b[*]' COLUMNS (l_js_id FOR ORDINALITY, b INT PATH '$'))) as jt;
-ERROR 42S22: Unknown column 't1.no_field' in 'JSON_TABLE argument'
+ERROR 42S22: Unknown column 't1.no_field' in 'JSON_TABLE'
 select * from t1, JSON_TABLE(t1.no_field, '$[*]' COLUMNS(js_id FOR ORDINALITY, a INT PATH '$.a', NESTED PATH '$.b[*]' COLUMNS (l_js_id FOR ORDINALITY, a INT PATH '$'))) as jt;
 ERROR 42S21: Duplicate column name 'a'
 DROP TABLE t1;
@@ -55,7 +55,7 @@ item_name	item_props	color
 Laptop	{"color": "black", "price": 1000}	black
 Jeans	{"color": "blue", "price": 50}	blue
 select * from t1 right join json_table(t1.item_props,'$' columns( color varchar(100) path '$.color')) as T on 1;
-ERROR 42S22: Unknown column 't1.item_props' in 'JSON_TABLE argument'
+ERROR 42S22: Unknown column 't1.item_props' in 'JSON_TABLE'
 DROP TABLE t1;
 select * from JSON_TABLE( '[ {"xa": 1, "b": [11,111]}, {"a": 2, "b": [22,222]}, {"a":3}]', '$[*]' COLUMNS( a INT PATH '$.a' default 101 on empty, NESTED PATH '$.b[*]' COLUMNS (b INT PATH '$'))) as jt;
 a	b
@@ -249,14 +249,14 @@ CREATE TABLE t1 (x INT);
 INSERT INTO t1 VALUES (1), (2), (3);
 SELECT t1.x*2 m, jt.* FROM t1,
 JSON_TABLE(m, '$[*]' COLUMNS (i INT PATH '$')) jt;
-ERROR 42S22: Unknown column 'm' in 'JSON_TABLE argument'
+ERROR 42S22: Unknown column 'm' in 'JSON_TABLE'
 DROP TABLE t1;
 select *
 from
 json_table(JS3.size, '$' columns (size INT PATH '$.size')) as JS1,
 json_table(JS1.size, '$' columns (size INT PATH '$.size')) as JS2,
 json_table(JS1.size, '$' columns (size INT PATH '$.size')) as JS3 where  1;
-ERROR 42S22: Unknown column 'JS3.size' in 'JSON_TABLE argument'
+ERROR 42S22: Unknown column 'JS3.size' in 'JSON_TABLE'
 create table t1 (json varchar(100) character set utf8);
 insert into t1 values ('{"value":"АБВ"}');
 create table tj1 as 
@@ -283,7 +283,7 @@ test.t1	analyze	status	Engine-independent statistics collected
 test.t1	analyze	Warning	Engine-independent statistics are not collected for column 'f1'
 test.t1	analyze	status	OK
 SELECT * FROM JSON_TABLE(tt3.f1, "$" COLUMNS (id FOR ORDINALITY)) AS tbl STRAIGHT_JOIN t1 AS tt3;
-ERROR 42S22: Unknown column 'tt3.f1' in 'JSON_TABLE argument'
+ERROR 42S22: Unknown column 'tt3.f1' in 'JSON_TABLE'
 SELECT * FROM t1 as jj1,
 (SELECT tt2.*
 FROM
@@ -293,7 +293,7 @@ STRAIGHT_JOIN
 t1 AS tt3
 ) dt
 ORDER BY 1,3 LIMIT 10;
-ERROR 42S22: Unknown column 'tt3.f1' in 'JSON_TABLE argument'
+ERROR 42S22: Unknown column 'tt3.f1' in 'JSON_TABLE'
 drop table t1;
 select collation(x) from 
 JSON_TABLE('["abc"]', '$[*]' COLUMNS (x VARCHAR(10) CHARSET latin1 PATH '$')) tbl;
@@ -601,13 +601,13 @@ DROP TABLE t1;
 #
 CREATE TABLE t1 (a INT);
 SELECT * FROM t1 RIGHT JOIN JSON_TABLE(t1.a,'$' COLUMNS(o FOR ORDINALITY)) jt ON TRUE;
-ERROR 42S22: Unknown column 't1.a' in 'JSON_TABLE argument'
+ERROR 42S22: Unknown column 't1.a' in 'JSON_TABLE'
 CREATE VIEW v AS
 SELECT * FROM t1 RIGHT JOIN JSON_TABLE(t1.a,'$' COLUMNS(o FOR ORDINALITY)) jt ON TRUE;
-ERROR 42S22: Unknown column 't1.a' in 'JSON_TABLE argument'
+ERROR 42S22: Unknown column 't1.a' in 'JSON_TABLE'
 insert into t1 values (1),(2),(3);
 SELECT * FROM t1 RIGHT JOIN JSON_TABLE(t1.a,'$' COLUMNS(o FOR ORDINALITY)) jt ON TRUE;
-ERROR 42S22: Unknown column 't1.a' in 'JSON_TABLE argument'
+ERROR 42S22: Unknown column 't1.a' in 'JSON_TABLE'
 drop table t1;
 #
 # MDEV-25202: JSON_TABLE: Early table reference leads to unexpected result set, server crash
@@ -617,9 +617,9 @@ INSERT INTO t1 VALUES (1),(2);
 CREATE TABLE t2 (a INT);
 INSERT INTO t2 VALUES (3),(4);
 SELECT * FROM JSON_TABLE(a, '$' COLUMNS(o FOR ORDINALITY)) AS jt1 NATURAL JOIN t1 JOIN t2;
-ERROR 42S22: Unknown column 'a' in 'JSON_TABLE argument'
+ERROR 42S22: Unknown column 'a' in 'JSON_TABLE'
 SELECT * FROM JSON_TABLE(a, '$' COLUMNS(o FOR ORDINALITY)) AS jt1 NATURAL JOIN t1 STRAIGHT_JOIN t2;
-ERROR 42S22: Unknown column 'a' in 'JSON_TABLE argument'
+ERROR 42S22: Unknown column 'a' in 'JSON_TABLE'
 drop table t1,t2;
 # Now, try a JSON_TABLE that has a subquery that has an outside reference:
 create table t1(a int, js varchar(32));
@@ -641,7 +641,7 @@ t1 right join
 json_table(concat('',js),
 '$' columns ( color varchar(32) path '$.color')
 ) as JT on 1;
-ERROR 42S22: Unknown column 'js' in 'JSON_TABLE argument'
+ERROR 42S22: Unknown column 'js' in 'JSON_TABLE'
 explain
 select *
 from
@@ -659,7 +659,7 @@ t1 right join
 json_table((select concat(a,js) from t2),
 '$' columns ( color varchar(32) path '$.color')
 ) as JT on 1;
-ERROR 42S22: Unknown column 'js' in 'field list'
+ERROR 42S22: Unknown column 'js' in 'SELECT'
 drop table t1,t2;
 #
 # Now, a testcase with JSON_TABLEs inside NATURAL JOIN
@@ -676,7 +676,7 @@ natural join
 json_table(JT.d, '$' COLUMNS (d for ordinality)) as JT2
 )
 );
-ERROR 42S22: Unknown column 'JT2.d' in 'JSON_TABLE argument'
+ERROR 42S22: Unknown column 'JT2.d' in 'JSON_TABLE'
 drop table t1, t2;
 #
 # MDEV-25352: JSON_TABLE: Inconsistent name resolution and ER_VIEW_INVALID ...
@@ -692,10 +692,10 @@ t1 NATURAL JOIN t2
 RIGHT JOIN
 JSON_TABLE (t1.b, '$' COLUMNS(o FOR ORDINALITY)) AS jt ON (t1.a = jt.o)
 WHERE t1.a = 1;
-ERROR 42S22: Unknown column 't1.b' in 'JSON_TABLE argument'
+ERROR 42S22: Unknown column 't1.b' in 'JSON_TABLE'
 CREATE OR REPLACE VIEW v AS
 SELECT t1.* FROM t1 NATURAL JOIN t2 RIGHT JOIN JSON_TABLE (t1.b, '$' COLUMNS(o FOR ORDINALITY)) AS jt ON (t1.a = jt.o) WHERE t1.a = 1;
-ERROR 42S22: Unknown column 't1.b' in 'JSON_TABLE argument'
+ERROR 42S22: Unknown column 't1.b' in 'JSON_TABLE'
 drop table t1,t2;
 #
 # MDEV-25256: JSON_TABLE: Error ER_VIEW_INVALID upon running query via view
@@ -707,14 +707,14 @@ ON(1)
 RIGHT JOIN JSON_TABLE('[]', '$' COLUMNS(o3 FOR ORDINALITY)) AS jt3
 ON(1)
 WHERE 0;
-ERROR 42S22: Unknown column 'jt1.a' in 'JSON_TABLE argument'
+ERROR 42S22: Unknown column 'jt1.a' in 'JSON_TABLE'
 #
 # MDEV-25346: JSON_TABLE: Server crashes in Item_field::fix_outer_field upon subquery with unknown column
 #
 CREATE TABLE t1 (a INT);
 CREATE TABLE t2 (b INT);
 SELECT * FROM ( SELECT * FROM t1 JOIN t2 ON (b IN(SELECT x FROM (SELECT 1 AS c) AS sq1))) AS sq2;
-ERROR 42S22: Unknown column 'x' in 'field list'
+ERROR 42S22: Unknown column 'x' in 'SELECT'
 DROP TABLE t1, t2;
 #
 # Another testcase
diff --git a/mysql-test/suite/json/r/json_table_mysql.result b/mysql-test/suite/json/r/json_table_mysql.result
index 5f9c437ee6b..b198bea4d9d 100644
--- a/mysql-test/suite/json/r/json_table_mysql.result
+++ b/mysql-test/suite/json/r/json_table_mysql.result
@@ -575,7 +575,7 @@ NULL
 # Bug#25413069: SIG11 IN CHECK_COLUMN_GRANT_IN_TABLE_REF
 #
 SELECT a FROM JSON_TABLE(abc, '$[*]' COLUMNS ( a int path '$.a')) AS jt;
-ERROR 42S22: Unknown column 'abc' in 'JSON_TABLE argument'
+ERROR 42S22: Unknown column 'abc' in 'JSON_TABLE'
 #
 # Bug#25420680: ASSERTION `THD->IS_ERROR()' FAILED IN SQL/SQL_SELECT.CC
 #
@@ -663,10 +663,10 @@ DEALLOCATE PREPARE stmt;
 CREATE TABLE t1 (id INT, jc JSON);
 SELECT * FROM t1 RIGHT JOIN JSON_TABLE(t1.jc, '$' COLUMNS
 (id FOR ORDINALITY)) as jt ON t1.jc=jt.id;
-ERROR 42S22: Unknown column 't1.jc' in 'JSON_TABLE argument'
+ERROR 42S22: Unknown column 't1.jc' in 'JSON_TABLE'
 SELECT * FROM JSON_TABLE(t1.jc, '$' COLUMNS
 (id FOR ORDINALITY)) as jt LEFT JOIN t1 ON t1.jc=jt.id;
-ERROR 42S22: Unknown column 't1.jc' in 'JSON_TABLE argument'
+ERROR 42S22: Unknown column 't1.jc' in 'JSON_TABLE'
 SELECT * FROM JSON_TABLE(t1.jc, '$' COLUMNS
 (id FOR ORDINALITY)) as jt RIGHT JOIN t1 ON t1.jc=jt.id;
 id	id	jc
@@ -690,33 +690,33 @@ SELECT * FROM t1 AS t1o RIGHT JOIN
 (t1 AS t1i JOIN JSON_TABLE(t1o.jc, '$' COLUMNS
 (id FOR ORDINALITY)) as jt ON t1i.jc=jt.id)
 ON t1o.id=t1i.id;
-ERROR 42S22: Unknown column 't1o.jc' in 'JSON_TABLE argument'
+ERROR 42S22: Unknown column 't1o.jc' in 'JSON_TABLE'
 SELECT * FROM t1 AS t1o RIGHT JOIN
 (t1 AS t1i RIGHT JOIN JSON_TABLE(t1o.jc, '$' COLUMNS
 (id FOR ORDINALITY)) as jt ON t1i.jc=jt.id)
 ON t1o.id=t1i.id;
-ERROR 42S22: Unknown column 't1o.jc' in 'JSON_TABLE argument'
+ERROR 42S22: Unknown column 't1o.jc' in 'JSON_TABLE'
 WITH qn AS
 (SELECT jt.* FROM t1 RIGHT JOIN JSON_TABLE(t1.jc, '$' COLUMNS
 (id FOR ORDINALITY)) as jt ON t1.jc=jt.id)
 SELECT * from qn;
-ERROR 42S22: Unknown column 't1.jc' in 'JSON_TABLE argument'
+ERROR 42S22: Unknown column 't1.jc' in 'JSON_TABLE'
 WITH qn AS
 (SELECT 1 UNION
 SELECT jt.id FROM t1 RIGHT JOIN JSON_TABLE(t1.jc, '$' COLUMNS
 (id FOR ORDINALITY)) as jt ON t1.jc=jt.id)
 SELECT * from qn;
-ERROR 42S22: Unknown column 't1.jc' in 'JSON_TABLE argument'
+ERROR 42S22: Unknown column 't1.jc' in 'JSON_TABLE'
 SELECT * FROM t1 AS t1o RIGHT JOIN
 (t1 AS t1i JOIN JSON_TABLE(t1o.jc, '$' COLUMNS
 (id FOR ORDINALITY)) as jt ON t1i.jc=jt.id)
 ON t1o.id=t1i.id;
-ERROR 42S22: Unknown column 't1o.jc' in 'JSON_TABLE argument'
+ERROR 42S22: Unknown column 't1o.jc' in 'JSON_TABLE'
 SELECT * FROM t1 AS t1o RIGHT JOIN
 (t1 AS t1i RIGHT JOIN JSON_TABLE(t1o.jc, '$' COLUMNS
 (id FOR ORDINALITY)) as jt ON t1i.jc=jt.id)
 ON t1o.id=t1i.id;
-ERROR 42S22: Unknown column 't1o.jc' in 'JSON_TABLE argument'
+ERROR 42S22: Unknown column 't1o.jc' in 'JSON_TABLE'
 INSERT INTO t1 VALUES(1,"1"),(2,"4"),(3,"3");
 ANALYZE TABLE t1;
 Table	Op	Msg_type	Msg_text
@@ -739,14 +739,14 @@ LEFT JOIN
 JSON_TABLE(t1.jc, '$' COLUMNS (id FOR ORDINALITY)) as jt ON t1.jc=jt.id
 RIGHT JOIN
 JSON_TABLE(jt.id, '$' COLUMNS (id FOR ORDINALITY)) as jt1 ON jt.id=jt1.id;
-ERROR 42S22: Unknown column 'jt.id' in 'JSON_TABLE argument'
+ERROR 42S22: Unknown column 'jt.id' in 'JSON_TABLE'
 DROP TABLE t1;
 #
 # Bug#25525409: ASSERTION `TABLE_LIST->TABLE' FAILED IN SQL/SQL_BASE.CC
 #
 SELECT * FROM JSON_TABLE( ( SELECT a ) , '$.*' COLUMNS (col1 FOR ORDINALITY) )
 AS alias1;
-ERROR 42S22: Unknown column 'a' in 'field list'
+ERROR 42S22: Unknown column 'a' in 'SELECT'
 SELECT * FROM JSON_TABLE( ( SELECT 1 ) , '$.*' COLUMNS (col1 FOR ORDINALITY) )
 AS alias1;
 col1
@@ -1046,7 +1046,7 @@ CREATE TABLE t (x INT);
 INSERT INTO t VALUES (1), (2), (3);
 SELECT MAX(t.x) OVER () m, jt.* FROM t,
 JSON_TABLE(JSON_ARRAY(m), '$[*]' COLUMNS (i INT PATH '$')) jt;
-ERROR 42S22: Unknown column 'm' in 'JSON_TABLE argument'
+ERROR 42S22: Unknown column 'm' in 'JSON_TABLE'
 DROP TABLE t;
 #
 # Bug#26583283: ASSERTION `!THD->IS_ERROR()' FAILED IN SQL_RESOLVER.CC
diff --git a/mysql-test/suite/maria/alter.result b/mysql-test/suite/maria/alter.result
index 17164343163..9ba9338b861 100644
--- a/mysql-test/suite/maria/alter.result
+++ b/mysql-test/suite/maria/alter.result
@@ -39,7 +39,7 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1 TRANSACTIONAL=1
 INSERT INTO t1 VALUES (1),(2);
 ALTER TABLE t1 ORDER BY unknown_column;
-ERROR 42S22: Unknown column 'unknown_column' in 'order clause'
+ERROR 42S22: Unknown column 'unknown_column' in 'ORDER BY'
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
@@ -143,7 +143,7 @@ connection default;
 INSERT INTO t1 SELECT a FROM t2;
 ERROR 21S01: Column count doesn't match value count at row 1
 connection con1;
-ERROR 42S22: Unknown column 'b' in 'field list'
+ERROR 42S22: Unknown column 'b' in 'SELECT'
 disconnect con1;
 connection default;
 drop table t1, t2;
@@ -154,7 +154,7 @@ CREATE TABLE t2 (a INT) ENGINE=InnoDB;
 INSERT INTO t2 VALUES (1);
 ALTER TABLE t1 DISABLE KEYS;
 INSERT INTO t1 (id) SELECT b FROM t2;
-ERROR 42S22: Unknown column 'b' in 'field list'
+ERROR 42S22: Unknown column 'b' in 'SELECT'
 INSERT INTO t1 SELECT a FROM t2;
 ERROR 21S01: Column count doesn't match value count at row 1
 SELECT COUNT(*) FROM t1;
diff --git a/mysql-test/suite/maria/ps_maria.result b/mysql-test/suite/maria/ps_maria.result
index 3f806c43dbd..1cbc46e8943 100644
--- a/mysql-test/suite/maria/ps_maria.result
+++ b/mysql-test/suite/maria/ps_maria.result
@@ -440,7 +440,7 @@ a	b
 4	four
 set @arg00=0 ;
 execute stmt1 using @arg00;
-ERROR 42S22: Unknown column '?' in 'order clause'
+ERROR 42S22: Unknown column '?' in 'ORDER BY'
 set @arg00=1;
 prepare stmt1 from ' select a,b from t1 order by a
 limit 1 ';
diff --git a/mysql-test/suite/plugins/r/audit_null.result b/mysql-test/suite/plugins/r/audit_null.result
index ada85b661ee..ea4158f1333 100644
--- a/mysql-test/suite/plugins/r/audit_null.result
+++ b/mysql-test/suite/plugins/r/audit_null.result
@@ -7,7 +7,7 @@ select 1;
 1
 1
 select foobar;
-ERROR 42S22: Unknown column 'foobar' in 'field list'
+ERROR 42S22: Unknown column 'foobar' in 'SELECT'
 show status like 'audit_null%';
 Variable_name	Value
 Audit_null_called	9
diff --git a/mysql-test/suite/rpl/r/create_or_replace2.result b/mysql-test/suite/rpl/r/create_or_replace2.result
index adcceaf97dd..a1f7706713e 100644
--- a/mysql-test/suite/rpl/r/create_or_replace2.result
+++ b/mysql-test/suite/rpl/r/create_or_replace2.result
@@ -24,7 +24,7 @@ SELECT f1();
 connection con1;
 unlock tables;
 connection default;
-ERROR 42S22: Unknown column 'a' in 'field list'
+ERROR 42S22: Unknown column 'a' in 'SELECT'
 disconnect con1;
 drop function f1;
 drop table t1;
diff --git a/mysql-test/suite/rpl/r/rpl_trans_no_trans.result b/mysql-test/suite/rpl/r/rpl_trans_no_trans.result
index a7a6d921bc1..4309ee46bba 100644
--- a/mysql-test/suite/rpl/r/rpl_trans_no_trans.result
+++ b/mysql-test/suite/rpl/r/rpl_trans_no_trans.result
@@ -36,7 +36,7 @@ SET @a = unknown_column_just_to_raise_an_error;
 INSERT INTO t2 VALUES (NULL) ; 
 END||
 INSERT INTO t1 VALUES (1);
-ERROR 42S22: Unknown column 'unknown_column_just_to_raise_an_error' in 'field list'
+ERROR 42S22: Unknown column 'unknown_column_just_to_raise_an_error' in 'SET'
 connection slave;
 connection master;
 drop trigger tr;
diff --git a/mysql-test/suite/sql_sequence/next.result b/mysql-test/suite/sql_sequence/next.result
index 9d55921006b..c20b4a9a1e2 100644
--- a/mysql-test/suite/sql_sequence/next.result
+++ b/mysql-test/suite/sql_sequence/next.result
@@ -497,7 +497,7 @@ select next value for t1;
 next value for t1
 1
 select next value for t1, minimum_value;
-ERROR 42S22: Unknown column 'minimum_value' in 'field list'
+ERROR 42S22: Unknown column 'minimum_value' in 'SELECT'
 drop sequence t1;
 #
 # MDEV-12854 Synchronize CREATE..SELECT data type and result set metadata data type for INT functions
diff --git a/mysql-test/suite/sys_vars/r/aria_log_dir_path_basic.result b/mysql-test/suite/sys_vars/r/aria_log_dir_path_basic.result
index 8563b024a75..83351ade4d2 100644
--- a/mysql-test/suite/sys_vars/r/aria_log_dir_path_basic.result
+++ b/mysql-test/suite/sys_vars/r/aria_log_dir_path_basic.result
@@ -33,4 +33,4 @@ SELECT COUNT(@@GLOBAL.aria_log_dir_path);
 COUNT(@@GLOBAL.aria_log_dir_path)
 1
 SELECT aria_log_dir_path = @@SESSION.aria_log_dir_path;
-ERROR 42S22: Unknown column 'aria_log_dir_path' in 'field list'
+ERROR 42S22: Unknown column 'aria_log_dir_path' in 'SELECT'
diff --git a/mysql-test/suite/sys_vars/r/auto_increment_increment_basic.result b/mysql-test/suite/sys_vars/r/auto_increment_increment_basic.result
index 3e66041856f..cb8d1712bb2 100644
--- a/mysql-test/suite/sys_vars/r/auto_increment_increment_basic.result
+++ b/mysql-test/suite/sys_vars/r/auto_increment_increment_basic.result
@@ -149,11 +149,11 @@ SELECT @@auto_increment_increment;
 @@auto_increment_increment
 1
 SELECT local.auto_increment_increment;
-ERROR 42S02: Unknown table 'local' in field list
+ERROR 42S02: Unknown table 'local' in SELECT
 SELECT session.auto_increment_increment;
-ERROR 42S02: Unknown table 'session' in field list
+ERROR 42S02: Unknown table 'session' in SELECT
 SELECT auto_increment_increment = @@session.auto_increment_increment;
-ERROR 42S22: Unknown column 'auto_increment_increment' in 'field list'
+ERROR 42S22: Unknown column 'auto_increment_increment' in 'SELECT'
 SET @@global.auto_increment_increment = @start_global_value;
 SELECT @@global.auto_increment_increment;
 @@global.auto_increment_increment
diff --git a/mysql-test/suite/sys_vars/r/auto_increment_offset_basic.result b/mysql-test/suite/sys_vars/r/auto_increment_offset_basic.result
index cc7b6b693c0..3d41be0ce2f 100644
--- a/mysql-test/suite/sys_vars/r/auto_increment_offset_basic.result
+++ b/mysql-test/suite/sys_vars/r/auto_increment_offset_basic.result
@@ -162,11 +162,11 @@ SELECT @@auto_increment_offset;
 @@auto_increment_offset
 1
 SELECT local.auto_increment_offset;
-ERROR 42S02: Unknown table 'local' in field list
+ERROR 42S02: Unknown table 'local' in SELECT
 SELECT session.auto_increment_offset;
-ERROR 42S02: Unknown table 'session' in field list
+ERROR 42S02: Unknown table 'session' in SELECT
 SELECT auto_increment_offset = @@session.auto_increment_offset;
-ERROR 42S22: Unknown column 'auto_increment_offset' in 'field list'
+ERROR 42S22: Unknown column 'auto_increment_offset' in 'SELECT'
 SET @@global.auto_increment_offset = @start_global_value;
 SELECT @@global.auto_increment_offset;
 @@global.auto_increment_offset
diff --git a/mysql-test/suite/sys_vars/r/autocommit_basic.result b/mysql-test/suite/sys_vars/r/autocommit_basic.result
index 68531f8b5a6..912dcbcf880 100644
--- a/mysql-test/suite/sys_vars/r/autocommit_basic.result
+++ b/mysql-test/suite/sys_vars/r/autocommit_basic.result
@@ -105,11 +105,11 @@ SELECT @@autocommit;
 @@autocommit
 1
 SELECT local.autocommit;
-ERROR 42S02: Unknown table 'local' in field list
+ERROR 42S02: Unknown table 'local' in SELECT
 SELECT session.autocommit;
-ERROR 42S02: Unknown table 'session' in field list
+ERROR 42S02: Unknown table 'session' in SELECT
 SELECT autocommit = @@session.autocommit;
-ERROR 42S22: Unknown column 'autocommit' in 'field list'
+ERROR 42S22: Unknown column 'autocommit' in 'SELECT'
 SET @@global.autocommit = @start_value;
 SELECT @@global.autocommit;
 @@global.autocommit
diff --git a/mysql-test/suite/sys_vars/r/automatic_sp_privileges_basic.result b/mysql-test/suite/sys_vars/r/automatic_sp_privileges_basic.result
index 760cca25497..bad0dd451b8 100644
--- a/mysql-test/suite/sys_vars/r/automatic_sp_privileges_basic.result
+++ b/mysql-test/suite/sys_vars/r/automatic_sp_privileges_basic.result
@@ -85,11 +85,11 @@ SELECT @@automatic_sp_privileges = @@global.automatic_sp_privileges;
 SET automatic_sp_privileges = 1;
 ERROR HY000: Variable 'automatic_sp_privileges' is a GLOBAL variable and should be set with SET GLOBAL
 SELECT local.automatic_sp_privileges;
-ERROR 42S02: Unknown table 'local' in field list
+ERROR 42S02: Unknown table 'local' in SELECT
 SELECT global.automatic_sp_privileges;
-ERROR 42S02: Unknown table 'global' in field list
+ERROR 42S02: Unknown table 'global' in SELECT
 SELECT automatic_sp_privileges = @@session.automatic_sp_privileges;
-ERROR 42S22: Unknown column 'automatic_sp_privileges' in 'field list'
+ERROR 42S22: Unknown column 'automatic_sp_privileges' in 'SELECT'
 SET @@global.automatic_sp_privileges = @start_value;
 SELECT @@global.automatic_sp_privileges;
 @@global.automatic_sp_privileges
diff --git a/mysql-test/suite/sys_vars/r/basedir_basic.result b/mysql-test/suite/sys_vars/r/basedir_basic.result
index 9b18f08305c..32c44660679 100644
--- a/mysql-test/suite/sys_vars/r/basedir_basic.result
+++ b/mysql-test/suite/sys_vars/r/basedir_basic.result
@@ -49,5 +49,5 @@ COUNT(@@GLOBAL.basedir)
 1
 1 Expected
 SELECT basedir = @@SESSION.basedir;
-ERROR 42S22: Unknown column 'basedir' in 'field list'
+ERROR 42S22: Unknown column 'basedir' in 'SELECT'
 Expected error 'Readonly variable'
diff --git a/mysql-test/suite/sys_vars/r/big_tables_basic.result b/mysql-test/suite/sys_vars/r/big_tables_basic.result
index a4ee8e83e5e..8811396563f 100644
--- a/mysql-test/suite/sys_vars/r/big_tables_basic.result
+++ b/mysql-test/suite/sys_vars/r/big_tables_basic.result
@@ -113,11 +113,11 @@ SELECT @@big_tables;
 @@big_tables
 1
 SELECT local.big_tables;
-ERROR 42S02: Unknown table 'local' in field list
+ERROR 42S02: Unknown table 'local' in SELECT
 SELECT session.big_tables;
-ERROR 42S02: Unknown table 'session' in field list
+ERROR 42S02: Unknown table 'session' in SELECT
 select big_tables;
-ERROR 42S22: Unknown column 'big_tables' in 'field list'
+ERROR 42S22: Unknown column 'big_tables' in 'SELECT'
 SET @@big_tables = @start_value;
 Warnings:
 Warning	1287	'@@big_tables' is deprecated and will be removed in a future release
diff --git a/mysql-test/suite/sys_vars/r/bind_address_basic.result b/mysql-test/suite/sys_vars/r/bind_address_basic.result
index f360433a90c..0d4d2832032 100644
--- a/mysql-test/suite/sys_vars/r/bind_address_basic.result
+++ b/mysql-test/suite/sys_vars/r/bind_address_basic.result
@@ -53,5 +53,5 @@ COUNT(@@GLOBAL.bind_address)
 1
 1 Expected
 SELECT bind_address = @@SESSION.bind_address;
-ERROR 42S22: Unknown column 'bind_address' in 'field list'
+ERROR 42S22: Unknown column 'bind_address' in 'SELECT'
 Expected error 'Readonly variable'
diff --git a/mysql-test/suite/sys_vars/r/binlog_cache_size_basic.result b/mysql-test/suite/sys_vars/r/binlog_cache_size_basic.result
index faa21da6879..bb037f2369b 100644
--- a/mysql-test/suite/sys_vars/r/binlog_cache_size_basic.result
+++ b/mysql-test/suite/sys_vars/r/binlog_cache_size_basic.result
@@ -98,7 +98,7 @@ SELECT @@binlog_cache_size = @@global.binlog_cache_size;
 SET binlog_cache_size = 1;
 ERROR HY000: Variable 'binlog_cache_size' is a GLOBAL variable and should be set with SET GLOBAL
 SELECT global.binlog_cache_size;
-ERROR 42S02: Unknown table 'global' in field list
+ERROR 42S02: Unknown table 'global' in SELECT
 SELECT binlog_cache_size = @@session.binlog_cache_size;
-ERROR 42S22: Unknown column 'binlog_cache_size' in 'field list'
+ERROR 42S22: Unknown column 'binlog_cache_size' in 'SELECT'
 SET @@global.binlog_cache_size = @start_value;
diff --git a/mysql-test/suite/sys_vars/r/binlog_expire_logs_seconds_basic.result b/mysql-test/suite/sys_vars/r/binlog_expire_logs_seconds_basic.result
index 11dc27ecfe7..f6dfe62ccfa 100644
--- a/mysql-test/suite/sys_vars/r/binlog_expire_logs_seconds_basic.result
+++ b/mysql-test/suite/sys_vars/r/binlog_expire_logs_seconds_basic.result
@@ -98,11 +98,11 @@ SELECT @@binlog_expire_logs_seconds;
 @@binlog_expire_logs_seconds
 1
 SELECT local.binlog_expire_logs_seconds;
-ERROR 42S02: Unknown table 'local' in field list
+ERROR 42S02: Unknown table 'local' in SELECT
 SELECT global.binlog_expire_logs_seconds;
-ERROR 42S02: Unknown table 'global' in field list
+ERROR 42S02: Unknown table 'global' in SELECT
 SELECT binlog_expire_logs_seconds = @@session.binlog_expire_logs_seconds;
-ERROR 42S22: Unknown column 'binlog_expire_logs_seconds' in 'field list'
+ERROR 42S22: Unknown column 'binlog_expire_logs_seconds' in 'SELECT'
 SET @@global.binlog_expire_logs_seconds = @start_value_sec;
 SELECT @@global.binlog_expire_logs_seconds;
 @@global.binlog_expire_logs_seconds
diff --git a/mysql-test/suite/sys_vars/r/binlog_stmt_cache_size_basic.result b/mysql-test/suite/sys_vars/r/binlog_stmt_cache_size_basic.result
index 74cce393dbc..69d256bc918 100644
--- a/mysql-test/suite/sys_vars/r/binlog_stmt_cache_size_basic.result
+++ b/mysql-test/suite/sys_vars/r/binlog_stmt_cache_size_basic.result
@@ -98,7 +98,7 @@ SELECT @@binlog_stmt_cache_size = @@global.binlog_stmt_cache_size;
 SET binlog_stmt_cache_size = 1;
 ERROR HY000: Variable 'binlog_stmt_cache_size' is a GLOBAL variable and should be set with SET GLOBAL
 SELECT global.binlog_stmt_cache_size;
-ERROR 42S02: Unknown table 'global' in field list
+ERROR 42S02: Unknown table 'global' in SELECT
 SELECT binlog_stmt_cache_size = @@session.binlog_stmt_cache_size;
-ERROR 42S22: Unknown column 'binlog_stmt_cache_size' in 'field list'
+ERROR 42S22: Unknown column 'binlog_stmt_cache_size' in 'SELECT'
 SET @@global.binlog_stmt_cache_size = @start_value;
diff --git a/mysql-test/suite/sys_vars/r/bulk_insert_buffer_size_basic.result b/mysql-test/suite/sys_vars/r/bulk_insert_buffer_size_basic.result
index 97083da7033..65ce48560c4 100644
--- a/mysql-test/suite/sys_vars/r/bulk_insert_buffer_size_basic.result
+++ b/mysql-test/suite/sys_vars/r/bulk_insert_buffer_size_basic.result
@@ -134,11 +134,11 @@ SELECT @@bulk_insert_buffer_size;
 @@bulk_insert_buffer_size
 1
 SELECT local.bulk_insert_buffer_size;
-ERROR 42S02: Unknown table 'local' in field list
+ERROR 42S02: Unknown table 'local' in SELECT
 SELECT session.bulk_insert_buffer_size;
-ERROR 42S02: Unknown table 'session' in field list
+ERROR 42S02: Unknown table 'session' in SELECT
 SELECT bulk_insert_buffer_size = @@session.bulk_insert_buffer_size;
-ERROR 42S22: Unknown column 'bulk_insert_buffer_size' in 'field list'
+ERROR 42S22: Unknown column 'bulk_insert_buffer_size' in 'SELECT'
 SET @@global.bulk_insert_buffer_size = @start_global_value;
 SELECT @@global.bulk_insert_buffer_size;
 @@global.bulk_insert_buffer_size
diff --git a/mysql-test/suite/sys_vars/r/character_set_client_basic.result b/mysql-test/suite/sys_vars/r/character_set_client_basic.result
index a15e1d10b79..f5d9ad7997a 100644
--- a/mysql-test/suite/sys_vars/r/character_set_client_basic.result
+++ b/mysql-test/suite/sys_vars/r/character_set_client_basic.result
@@ -14,17 +14,17 @@ SELECT @session_start_value;
 latin1
 '#--------------------FN_DYNVARS_010_01------------------#'
 SELECT character_set_client;
-ERROR 42S22: Unknown column 'character_set_client' in 'field list'
+ERROR 42S22: Unknown column 'character_set_client' in 'SELECT'
 SET character_set_client=utf8;
 SELECT @@session.character_set_client;
 @@session.character_set_client
 utf8mb3
 SET session character_set_client=utf8;
 SELECT session character_set_client;
-ERROR 42S22: Unknown column 'session' in 'field list'
+ERROR 42S22: Unknown column 'session' in 'SELECT'
 SET global character_set_client=utf8;
 SELECT global character_set_client;
-ERROR 42S22: Unknown column 'global' in 'field list'
+ERROR 42S22: Unknown column 'global' in 'SELECT'
 '#--------------------FN_DYNVARS_010_02-------------------------#'
 SET @@character_set_client = latin5;
 SET @@character_set_client = DEFAULT;
@@ -68,7 +68,7 @@ res
 1
 '#--------------------FN_DYNVARS_010_05-------------------------#'
 SET @@character_set_client = utf8 + latin2;
-ERROR 42S22: Unknown column 'utf8' in 'field list'
+ERROR 42S22: Unknown column 'utf8' in 'SET'
 '#--------------------FN_DYNVARS_010_06-------------------------#'
 SET @@character_set_client = big5;
 SELECT @@character_set_client;
diff --git a/mysql-test/suite/sys_vars/r/character_set_connection_basic.result b/mysql-test/suite/sys_vars/r/character_set_connection_basic.result
index 6d098f37bd1..03f45d1c7d5 100644
--- a/mysql-test/suite/sys_vars/r/character_set_connection_basic.result
+++ b/mysql-test/suite/sys_vars/r/character_set_connection_basic.result
@@ -15,17 +15,17 @@ SELECT @session_start_value;
 latin1
 '#--------------------FN_DYNVARS_011_01------------------#'
 SELECT character_set_connection;
-ERROR 42S22: Unknown column 'character_set_connection' in 'field list'
+ERROR 42S22: Unknown column 'character_set_connection' in 'SELECT'
 SET character_set_connection=utf8;
 SELECT @@session.character_set_connection;
 @@session.character_set_connection
 utf8mb3
 SET session character_set_connection=utf8;
 SELECT session character_set_connection;
-ERROR 42S22: Unknown column 'session' in 'field list'
+ERROR 42S22: Unknown column 'session' in 'SELECT'
 SET global character_set_connection=utf8;
 SELECT global character_set_connection;
-ERROR 42S22: Unknown column 'global' in 'field list'
+ERROR 42S22: Unknown column 'global' in 'SELECT'
 '#--------------------FN_DYNVARS_011_02-------------------------#'
 SET @@character_set_connection = latin5;
 SET @@character_set_connection = DEFAULT;
@@ -69,7 +69,7 @@ res
 1
 '#--------------------FN_DYNVARS_011_05-------------------------#'
 SET @@character_set_connection = utf8 + latin2;
-ERROR 42S22: Unknown column 'utf8' in 'field list'
+ERROR 42S22: Unknown column 'utf8' in 'SET'
 '#--------------------FN_DYNVARS_011_06-------------------------#'
 SET @@session.character_set_connection = big5;
 SELECT @@session.character_set_connection;
diff --git a/mysql-test/suite/sys_vars/r/character_set_database_basic.result b/mysql-test/suite/sys_vars/r/character_set_database_basic.result
index 752dad8500e..65df0b3606f 100644
--- a/mysql-test/suite/sys_vars/r/character_set_database_basic.result
+++ b/mysql-test/suite/sys_vars/r/character_set_database_basic.result
@@ -17,17 +17,17 @@ SELECT @session_start_value;
 latin1
 '#--------------------FN_DYNVARS_012_01------------------#'
 SELECT character_set_database;
-ERROR 42S22: Unknown column 'character_set_database' in 'field list'
+ERROR 42S22: Unknown column 'character_set_database' in 'SELECT'
 SET character_set_database=utf8;
 SELECT @@session.character_set_database;
 @@session.character_set_database
 utf8mb3
 SET session character_set_database=utf8;
 SELECT session character_set_database;
-ERROR 42S22: Unknown column 'session' in 'field list'
+ERROR 42S22: Unknown column 'session' in 'SELECT'
 SET global character_set_database=utf8;
 SELECT global character_set_database;
-ERROR 42S22: Unknown column 'global' in 'field list'
+ERROR 42S22: Unknown column 'global' in 'SELECT'
 '#--------------------FN_DYNVARS_012_02-------------------------#'
 SET @@character_set_database = latin5;
 SET @@character_set_database = DEFAULT;
@@ -71,7 +71,7 @@ res
 1
 '#--------------------FN_DYNVARS_012_05-------------------------#'
 SET @@character_set_database = utf8 + latin2;
-ERROR 42S22: Unknown column 'utf8' in 'field list'
+ERROR 42S22: Unknown column 'utf8' in 'SET'
 '#--------------------FN_DYNVARS_012_06-------------------------#'
 SET @@session.character_set_database = big5;
 SELECT @@session.character_set_database;
diff --git a/mysql-test/suite/sys_vars/r/character_set_filesystem_basic.result b/mysql-test/suite/sys_vars/r/character_set_filesystem_basic.result
index 8c5b5e524ba..47925fb5269 100644
--- a/mysql-test/suite/sys_vars/r/character_set_filesystem_basic.result
+++ b/mysql-test/suite/sys_vars/r/character_set_filesystem_basic.result
@@ -16,17 +16,17 @@ SELECT @session_start_value;
 binary
 '#--------------------FN_DYNVARS_008_01------------------#'
 SELECT character_set_filesystem;
-ERROR 42S22: Unknown column 'character_set_filesystem' in 'field list'
+ERROR 42S22: Unknown column 'character_set_filesystem' in 'SELECT'
 SET character_set_filesystem=utf8;
 SELECT @@session.character_set_filesystem;
 @@session.character_set_filesystem
 utf8mb3
 SET session character_set_filesystem=utf8;
 SELECT session character_set_filesystem;
-ERROR 42S22: Unknown column 'session' in 'field list'
+ERROR 42S22: Unknown column 'session' in 'SELECT'
 SET global character_set_filesystem=utf8;
 SELECT global character_set_filesystem;
-ERROR 42S22: Unknown column 'global' in 'field list'
+ERROR 42S22: Unknown column 'global' in 'SELECT'
 '#--------------------FN_DYNVARS_008_02-------------------------#'
 SET @@character_set_filesystem = latin5;
 SET @@character_set_filesystem = DEFAULT;
@@ -70,7 +70,7 @@ res
 1
 '#--------------------FN_DYNVARS_008_05-------------------------#'
 SET @@character_set_filesystem = utf8 + latin2;
-ERROR 42S22: Unknown column 'utf8' in 'field list'
+ERROR 42S22: Unknown column 'utf8' in 'SET'
 '#--------------------FN_DYNVARS_008_06-------------------------#'
 SET @@session.character_set_filesystem = big5;
 SELECT @@session.character_set_filesystem;
diff --git a/mysql-test/suite/sys_vars/r/character_set_results_basic.result b/mysql-test/suite/sys_vars/r/character_set_results_basic.result
index 86cd9265efb..3b82310336a 100644
Binary files a/mysql-test/suite/sys_vars/r/character_set_results_basic.result and b/mysql-test/suite/sys_vars/r/character_set_results_basic.result differ
diff --git a/mysql-test/suite/sys_vars/r/character_set_server_basic.result b/mysql-test/suite/sys_vars/r/character_set_server_basic.result
index e395b048f42..40ece4ffb81 100644
--- a/mysql-test/suite/sys_vars/r/character_set_server_basic.result
+++ b/mysql-test/suite/sys_vars/r/character_set_server_basic.result
@@ -17,17 +17,17 @@ SELECT @session_start_value;
 latin1
 '#--------------------FN_DYNVARS_009_01------------------#'
 SELECT character_set_server;
-ERROR 42S22: Unknown column 'character_set_server' in 'field list'
+ERROR 42S22: Unknown column 'character_set_server' in 'SELECT'
 SET character_set_server=utf8;
 SELECT @@session.character_set_server;
 @@session.character_set_server
 utf8mb3
 SET session character_set_server=utf8;
 SELECT session character_set_server;
-ERROR 42S22: Unknown column 'session' in 'field list'
+ERROR 42S22: Unknown column 'session' in 'SELECT'
 SET global character_set_server=utf8;
 SELECT global character_set_server;
-ERROR 42S22: Unknown column 'global' in 'field list'
+ERROR 42S22: Unknown column 'global' in 'SELECT'
 SET @@character_set_server = null;
 ERROR 42000: Variable 'character_set_server' can't be set to the value of 'NULL'
 '#--------------------FN_DYNVARS_009_02-------------------------#'
@@ -73,7 +73,7 @@ res
 1
 '#--------------------FN_DYNVARS_009_05-------------------------#'
 SET @@character_set_server = utf8 + latin2;
-ERROR 42S22: Unknown column 'utf8' in 'field list'
+ERROR 42S22: Unknown column 'utf8' in 'SET'
 '#--------------------FN_DYNVARS_009_06-------------------------#'
 SET @@session.character_set_server = big5;
 SELECT @@session.character_set_server;
diff --git a/mysql-test/suite/sys_vars/r/character_set_system_basic.result b/mysql-test/suite/sys_vars/r/character_set_system_basic.result
index 9f4b68ae861..13ecdedf15f 100644
--- a/mysql-test/suite/sys_vars/r/character_set_system_basic.result
+++ b/mysql-test/suite/sys_vars/r/character_set_system_basic.result
@@ -49,5 +49,5 @@ COUNT(@@GLOBAL.character_set_system)
 1
 1 Expected
 SELECT character_set_system = @@SESSION.character_set_system;
-ERROR 42S22: Unknown column 'character_set_system' in 'field list'
+ERROR 42S22: Unknown column 'character_set_system' in 'SELECT'
 Expected error 'Readonly variable'
diff --git a/mysql-test/suite/sys_vars/r/collation_connection_basic.result b/mysql-test/suite/sys_vars/r/collation_connection_basic.result
index f95c6265f60..cf6ffce2b5d 100644
--- a/mysql-test/suite/sys_vars/r/collation_connection_basic.result
+++ b/mysql-test/suite/sys_vars/r/collation_connection_basic.result
@@ -17,17 +17,17 @@ SELECT @session_start_value;
 latin1_swedish_ci
 '#--------------------FN_DYNVARS_015_01------------------#'
 SELECT collation_connection;
-ERROR 42S22: Unknown column 'collation_connection' in 'field list'
+ERROR 42S22: Unknown column 'collation_connection' in 'SELECT'
 SET collation_connection=utf8_unicode_ci;
 SELECT @@session.collation_connection;
 @@session.collation_connection
 utf8mb3_unicode_ci
 SET session collation_connection=utf8_unicode_ci;
 SELECT session collation_connection;
-ERROR 42S22: Unknown column 'session' in 'field list'
+ERROR 42S22: Unknown column 'session' in 'SELECT'
 SET global collation_connection=utf8_unicode_ci;
 SELECT global collation_connection;
-ERROR 42S22: Unknown column 'global' in 'field list'
+ERROR 42S22: Unknown column 'global' in 'SELECT'
 '#--------------------FN_DYNVARS_015_02-------------------------#'
 SET @@collation_connection = latin1_bin;
 SET @@collation_connection = DEFAULT;
@@ -71,7 +71,7 @@ res
 1
 '#--------------------FN_DYNVARS_015_05-------------------------#'
 SET @@collation_connection = latin7_general_ci + latin7_general_cs;
-ERROR 42S22: Unknown column 'latin7_general_ci' in 'field list'
+ERROR 42S22: Unknown column 'latin7_general_ci' in 'SET'
 '#--------------------FN_DYNVARS_015_06-------------------------#'
 SET @@session.collation_connection = big5_chinese_ci;
 SELECT @@session.collation_connection;
diff --git a/mysql-test/suite/sys_vars/r/collation_database_basic.result b/mysql-test/suite/sys_vars/r/collation_database_basic.result
index 4a3242a7fdb..5f86513567f 100644
--- a/mysql-test/suite/sys_vars/r/collation_database_basic.result
+++ b/mysql-test/suite/sys_vars/r/collation_database_basic.result
@@ -17,18 +17,18 @@ SELECT @session_start_value;
 latin1_swedish_ci
 '#--------------------FN_DYNVARS_016_01------------------#'
 SELECT collation_database;
-ERROR 42S22: Unknown column 'collation_database' in 'field list'
+ERROR 42S22: Unknown column 'collation_database' in 'SELECT'
 SET collation_database=utf8_unicode_ci;
 SELECT @@session.collation_database;
 @@session.collation_database
 utf8mb3_unicode_ci
 SET session collation_database=utf8_unicode_ci;
 SELECT session collation_database;
-ERROR 42S22: Unknown column 'session' in 'field list'
+ERROR 42S22: Unknown column 'session' in 'SELECT'
 SET global collation_database=utf8_unicode_ci;
 set global collation_database=@@collation_server;
 SELECT global collation_database;
-ERROR 42S22: Unknown column 'global' in 'field list'
+ERROR 42S22: Unknown column 'global' in 'SELECT'
 '#--------------------FN_DYNVARS_016_02-------------------------#'
 SET @@collation_database = latin1_bin;
 SET @@collation_database = DEFAULT;
@@ -74,7 +74,7 @@ res
 1
 '#--------------------FN_DYNVARS_016_05-------------------------#'
 SET @@collation_database = latin7_general_ci + latin7_general_cs;
-ERROR 42S22: Unknown column 'latin7_general_ci' in 'field list'
+ERROR 42S22: Unknown column 'latin7_general_ci' in 'SET'
 '#--------------------FN_DYNVARS_016_06-------------------------#'
 SET @@session.collation_database = big5_chinese_ci;
 SELECT @@session.collation_database;
diff --git a/mysql-test/suite/sys_vars/r/collation_server_basic.result b/mysql-test/suite/sys_vars/r/collation_server_basic.result
index 2914d8b65f6..793fa93d5e1 100644
--- a/mysql-test/suite/sys_vars/r/collation_server_basic.result
+++ b/mysql-test/suite/sys_vars/r/collation_server_basic.result
@@ -14,17 +14,17 @@ SELECT @session_start_value;
 latin1_swedish_ci
 '#--------------------FN_DYNVARS_014_01------------------#'
 SELECT collation_server;
-ERROR 42S22: Unknown column 'collation_server' in 'field list'
+ERROR 42S22: Unknown column 'collation_server' in 'SELECT'
 SET collation_server=utf8_unicode_ci;
 SELECT @@session.collation_server;
 @@session.collation_server
 utf8mb3_unicode_ci
 SET session collation_server=utf8_unicode_ci;
 SELECT session collation_server;
-ERROR 42S22: Unknown column 'session' in 'field list'
+ERROR 42S22: Unknown column 'session' in 'SELECT'
 SET global collation_server=utf8_unicode_ci;
 SELECT global collation_server;
-ERROR 42S22: Unknown column 'global' in 'field list'
+ERROR 42S22: Unknown column 'global' in 'SELECT'
 '#--------------------FN_DYNVARS_014_02-------------------------#'
 SET @@collation_server = latin1_bin;
 SET @@collation_server = DEFAULT;
@@ -67,7 +67,7 @@ res
 1
 '#--------------------FN_DYNVARS_014_05-------------------------#'
 SET @@collation_server = latin7_general_ci + latin7_general_cs;
-ERROR 42S22: Unknown column 'latin7_general_ci' in 'field list'
+ERROR 42S22: Unknown column 'latin7_general_ci' in 'SET'
 '#--------------------FN_DYNVARS_014_06-------------------------#'
 SET @@session.collation_server = big5_chinese_ci;
 SELECT @@session.collation_server;
diff --git a/mysql-test/suite/sys_vars/r/completion_type_basic.result b/mysql-test/suite/sys_vars/r/completion_type_basic.result
index 7f468121219..a5714263e16 100644
--- a/mysql-test/suite/sys_vars/r/completion_type_basic.result
+++ b/mysql-test/suite/sys_vars/r/completion_type_basic.result
@@ -119,11 +119,11 @@ SELECT @@completion_type;
 @@completion_type
 CHAIN
 SELECT local.completion_type;
-ERROR 42S02: Unknown table 'local' in field list
+ERROR 42S02: Unknown table 'local' in SELECT
 SELECT session.completion_type;
-ERROR 42S02: Unknown table 'session' in field list
+ERROR 42S02: Unknown table 'session' in SELECT
 SELECT completion_type = @@session.completion_type;
-ERROR 42S22: Unknown column 'completion_type' in 'field list'
+ERROR 42S22: Unknown column 'completion_type' in 'SELECT'
 SET @@global.completion_type = @start_global_value;
 SELECT @@global.completion_type;
 @@global.completion_type
diff --git a/mysql-test/suite/sys_vars/r/concurrent_insert_basic.result b/mysql-test/suite/sys_vars/r/concurrent_insert_basic.result
index 92e6a167c01..d7fe16598b3 100644
--- a/mysql-test/suite/sys_vars/r/concurrent_insert_basic.result
+++ b/mysql-test/suite/sys_vars/r/concurrent_insert_basic.result
@@ -102,9 +102,9 @@ SELECT @@concurrent_insert;
 @@concurrent_insert
 AUTO
 SELECT global.concurrent_insert;
-ERROR 42S02: Unknown table 'global' in field list
+ERROR 42S02: Unknown table 'global' in SELECT
 SELECT concurrent_insert = @@session.concurrent_insert;
-ERROR 42S22: Unknown column 'concurrent_insert' in 'field list'
+ERROR 42S22: Unknown column 'concurrent_insert' in 'SELECT'
 SET @@global.concurrent_insert = @start_value;
 SELECT @@global.concurrent_insert;
 @@global.concurrent_insert
diff --git a/mysql-test/suite/sys_vars/r/connect_timeout_basic.result b/mysql-test/suite/sys_vars/r/connect_timeout_basic.result
index d0a6a650e21..8610b26a74f 100644
--- a/mysql-test/suite/sys_vars/r/connect_timeout_basic.result
+++ b/mysql-test/suite/sys_vars/r/connect_timeout_basic.result
@@ -82,9 +82,9 @@ SELECT @@connect_timeout = @@global.connect_timeout;
 SET connect_timeout = 1;
 ERROR HY000: Variable 'connect_timeout' is a GLOBAL variable and should be set with SET GLOBAL
 SELECT global.connect_timeout;
-ERROR 42S02: Unknown table 'global' in field list
+ERROR 42S02: Unknown table 'global' in SELECT
 SELECT connect_timeout = @@session.connect_timeout;
-ERROR 42S22: Unknown column 'connect_timeout' in 'field list'
+ERROR 42S22: Unknown column 'connect_timeout' in 'SELECT'
 SET @@global.connect_timeout = @start_value;
 SELECT @@global.connect_timeout;
 @@global.connect_timeout
diff --git a/mysql-test/suite/sys_vars/r/datadir_basic.result b/mysql-test/suite/sys_vars/r/datadir_basic.result
index ade6f2873e8..ec4fa90a4ea 100644
--- a/mysql-test/suite/sys_vars/r/datadir_basic.result
+++ b/mysql-test/suite/sys_vars/r/datadir_basic.result
@@ -49,5 +49,5 @@ COUNT(@@GLOBAL.datadir)
 1
 1 Expected
 SELECT datadir = @@SESSION.datadir;
-ERROR 42S22: Unknown column 'datadir' in 'field list'
+ERROR 42S22: Unknown column 'datadir' in 'SELECT'
 Expected error 'Readonly variable'
diff --git a/mysql-test/suite/sys_vars/r/default_master_connection_basic.result b/mysql-test/suite/sys_vars/r/default_master_connection_basic.result
index bb82e3d5bd6..2d80241d5ca 100644
--- a/mysql-test/suite/sys_vars/r/default_master_connection_basic.result
+++ b/mysql-test/suite/sys_vars/r/default_master_connection_basic.result
@@ -79,11 +79,11 @@ SELECT @@default_master_connection;
 @@default_master_connection
 foo
 SELECT local.default_master_connection;
-ERROR 42S02: Unknown table 'local' in field list
+ERROR 42S02: Unknown table 'local' in SELECT
 SELECT session.default_master_connection;
-ERROR 42S02: Unknown table 'session' in field list
+ERROR 42S02: Unknown table 'session' in SELECT
 SELECT default_master_connection = @@session.default_master_connection;
-ERROR 42S22: Unknown column 'default_master_connection' in 'field list'
+ERROR 42S22: Unknown column 'default_master_connection' in 'SELECT'
 SET @@session.default_master_connection = @start_session_value;
 SELECT @@session.default_master_connection;
 @@session.default_master_connection
diff --git a/mysql-test/suite/sys_vars/r/default_storage_engine_basic.result b/mysql-test/suite/sys_vars/r/default_storage_engine_basic.result
index 7e12c7dc477..c74e6bed626 100644
--- a/mysql-test/suite/sys_vars/r/default_storage_engine_basic.result
+++ b/mysql-test/suite/sys_vars/r/default_storage_engine_basic.result
@@ -95,11 +95,11 @@ SELECT @@default_storage_engine;
 @@default_storage_engine
 MEMORY
 SELECT local.default_storage_engine;
-ERROR 42S02: Unknown table 'local' in field list
+ERROR 42S02: Unknown table 'local' in SELECT
 SELECT session.default_storage_engine;
-ERROR 42S02: Unknown table 'session' in field list
+ERROR 42S02: Unknown table 'session' in SELECT
 SELECT default_storage_engine = @@session.default_storage_engine;
-ERROR 42S22: Unknown column 'default_storage_engine' in 'field list'
+ERROR 42S22: Unknown column 'default_storage_engine' in 'SELECT'
 SET @@default_storage_engine = @start_global_value;
 SET @@global.default_storage_engine = @start_global_value;
 SET @@session.default_storage_engine = @start_session_value;
diff --git a/mysql-test/suite/sys_vars/r/default_tmp_storage_engine_basic.result b/mysql-test/suite/sys_vars/r/default_tmp_storage_engine_basic.result
index 3c218539472..0c38a361fdf 100644
--- a/mysql-test/suite/sys_vars/r/default_tmp_storage_engine_basic.result
+++ b/mysql-test/suite/sys_vars/r/default_tmp_storage_engine_basic.result
@@ -91,11 +91,11 @@ SELECT @@default_tmp_storage_engine;
 @@default_tmp_storage_engine
 MEMORY
 SELECT local.default_tmp_storage_engine;
-ERROR 42S02: Unknown table 'local' in field list
+ERROR 42S02: Unknown table 'local' in SELECT
 SELECT session.default_tmp_storage_engine;
-ERROR 42S02: Unknown table 'session' in field list
+ERROR 42S02: Unknown table 'session' in SELECT
 SELECT default_tmp_storage_engine = @@session.default_tmp_storage_engine;
-ERROR 42S22: Unknown column 'default_tmp_storage_engine' in 'field list'
+ERROR 42S22: Unknown column 'default_tmp_storage_engine' in 'SELECT'
 SET @@default_tmp_storage_engine = @start_global_value;
 SET default_tmp_storage_engine = MyISAM;
 SET default_storage_engine = MyISAM;
diff --git a/mysql-test/suite/sys_vars/r/default_week_format_basic.result b/mysql-test/suite/sys_vars/r/default_week_format_basic.result
index 4e9ee26ef9a..c8b7600b022 100644
--- a/mysql-test/suite/sys_vars/r/default_week_format_basic.result
+++ b/mysql-test/suite/sys_vars/r/default_week_format_basic.result
@@ -152,11 +152,11 @@ SELECT @@default_week_format;
 @@default_week_format
 1
 SELECT local.default_week_format;
-ERROR 42S02: Unknown table 'local' in field list
+ERROR 42S02: Unknown table 'local' in SELECT
 SELECT session.default_week_format;
-ERROR 42S02: Unknown table 'session' in field list
+ERROR 42S02: Unknown table 'session' in SELECT
 SELECT default_week_format = @@session.default_week_format;
-ERROR 42S22: Unknown column 'default_week_format' in 'field list'
+ERROR 42S22: Unknown column 'default_week_format' in 'SELECT'
 SET @@global.default_week_format = @start_global_value;
 SELECT @@global.default_week_format;
 @@global.default_week_format
diff --git a/mysql-test/suite/sys_vars/r/delayed_insert_limit_basic.result b/mysql-test/suite/sys_vars/r/delayed_insert_limit_basic.result
index f57fe02f810..529e244a432 100644
--- a/mysql-test/suite/sys_vars/r/delayed_insert_limit_basic.result
+++ b/mysql-test/suite/sys_vars/r/delayed_insert_limit_basic.result
@@ -96,11 +96,11 @@ SELECT @@delayed_insert_limit;
 @@delayed_insert_limit
 1
 SELECT local.delayed_insert_limit;
-ERROR 42S02: Unknown table 'local' in field list
+ERROR 42S02: Unknown table 'local' in SELECT
 SELECT global.delayed_insert_limit;
-ERROR 42S02: Unknown table 'global' in field list
+ERROR 42S02: Unknown table 'global' in SELECT
 SELECT delayed_insert_limit = @@session.delayed_insert_limit;
-ERROR 42S22: Unknown column 'delayed_insert_limit' in 'field list'
+ERROR 42S22: Unknown column 'delayed_insert_limit' in 'SELECT'
 SET @@global.delayed_insert_limit = @start_value;
 SELECT @@global.delayed_insert_limit;
 @@global.delayed_insert_limit
diff --git a/mysql-test/suite/sys_vars/r/delayed_insert_timeout_basic.result b/mysql-test/suite/sys_vars/r/delayed_insert_timeout_basic.result
index f9978929698..4758314e6af 100644
--- a/mysql-test/suite/sys_vars/r/delayed_insert_timeout_basic.result
+++ b/mysql-test/suite/sys_vars/r/delayed_insert_timeout_basic.result
@@ -94,11 +94,11 @@ SELECT @@delayed_insert_timeout;
 @@delayed_insert_timeout
 1
 SELECT local.delayed_insert_timeout;
-ERROR 42S02: Unknown table 'local' in field list
+ERROR 42S02: Unknown table 'local' in SELECT
 SELECT global.delayed_insert_timeout;
-ERROR 42S02: Unknown table 'global' in field list
+ERROR 42S02: Unknown table 'global' in SELECT
 SELECT delayed_insert_timeout = @@session.delayed_insert_timeout;
-ERROR 42S22: Unknown column 'delayed_insert_timeout' in 'field list'
+ERROR 42S22: Unknown column 'delayed_insert_timeout' in 'SELECT'
 SET @@global.delayed_insert_timeout = @start_value;
 SELECT @@global.delayed_insert_timeout;
 @@global.delayed_insert_timeout
diff --git a/mysql-test/suite/sys_vars/r/delayed_queue_size_basic.result b/mysql-test/suite/sys_vars/r/delayed_queue_size_basic.result
index 61bd04965fe..b1d9353f972 100644
--- a/mysql-test/suite/sys_vars/r/delayed_queue_size_basic.result
+++ b/mysql-test/suite/sys_vars/r/delayed_queue_size_basic.result
@@ -94,11 +94,11 @@ SELECT @@delayed_queue_size;
 @@delayed_queue_size
 1
 SELECT local.delayed_queue_size;
-ERROR 42S02: Unknown table 'local' in field list
+ERROR 42S02: Unknown table 'local' in SELECT
 SELECT global.delayed_queue_size;
-ERROR 42S02: Unknown table 'global' in field list
+ERROR 42S02: Unknown table 'global' in SELECT
 SELECT delayed_queue_size = @@session.delayed_queue_size;
-ERROR 42S22: Unknown column 'delayed_queue_size' in 'field list'
+ERROR 42S22: Unknown column 'delayed_queue_size' in 'SELECT'
 SET @@global.delayed_queue_size = @start_value;
 SELECT @@global.delayed_queue_size;
 @@global.delayed_queue_size
diff --git a/mysql-test/suite/sys_vars/r/div_precision_increment_basic.result b/mysql-test/suite/sys_vars/r/div_precision_increment_basic.result
index db2fb18562f..2a57a219a69 100644
--- a/mysql-test/suite/sys_vars/r/div_precision_increment_basic.result
+++ b/mysql-test/suite/sys_vars/r/div_precision_increment_basic.result
@@ -168,11 +168,11 @@ SELECT @@div_precision_increment;
 @@div_precision_increment
 1
 SELECT local.div_precision_increment;
-ERROR 42S02: Unknown table 'local' in field list
+ERROR 42S02: Unknown table 'local' in SELECT
 SELECT session.div_precision_increment;
-ERROR 42S02: Unknown table 'session' in field list
+ERROR 42S02: Unknown table 'session' in SELECT
 SELECT div_precision_increment = @@session.div_precision_increment;
-ERROR 42S22: Unknown column 'div_precision_increment' in 'field list'
+ERROR 42S22: Unknown column 'div_precision_increment' in 'SELECT'
 SET @@global.div_precision_increment = @start_global_value;
 SELECT @@global.div_precision_increment;
 @@global.div_precision_increment
diff --git a/mysql-test/suite/sys_vars/r/error_count_basic.result b/mysql-test/suite/sys_vars/r/error_count_basic.result
index ea48b7d5b73..dfe6742cbb0 100644
--- a/mysql-test/suite/sys_vars/r/error_count_basic.result
+++ b/mysql-test/suite/sys_vars/r/error_count_basic.result
@@ -50,5 +50,5 @@ SELECT COUNT(@@GLOBAL.error_count);
 ERROR HY000: Variable 'error_count' is a SESSION variable
 Expected error 'Variable is a SESSION variable'
 SELECT COUNT(error_count = @@GLOBAL.error_count);
-ERROR 42S22: Unknown column 'error_count' in 'field list'
+ERROR 42S22: Unknown column 'error_count' in 'SELECT'
 Expected error 'Readonly variable'
diff --git a/mysql-test/suite/sys_vars/r/event_scheduler_basic.result b/mysql-test/suite/sys_vars/r/event_scheduler_basic.result
index 920b9ebbbfa..9dd0e479fc9 100644
--- a/mysql-test/suite/sys_vars/r/event_scheduler_basic.result
+++ b/mysql-test/suite/sys_vars/r/event_scheduler_basic.result
@@ -84,11 +84,11 @@ SELECT @@event_scheduler = @@global.event_scheduler;
 SET event_scheduler = ON;
 ERROR HY000: Variable 'event_scheduler' is a GLOBAL variable and should be set with SET GLOBAL
 SELECT local.event_scheduler;
-ERROR 42S02: Unknown table 'local' in field list
+ERROR 42S02: Unknown table 'local' in SELECT
 SELECT global.event_scheduler;
-ERROR 42S02: Unknown table 'global' in field list
+ERROR 42S02: Unknown table 'global' in SELECT
 SELECT event_scheduler = @@session.event_scheduler;
-ERROR 42S22: Unknown column 'event_scheduler' in 'field list'
+ERROR 42S22: Unknown column 'event_scheduler' in 'SELECT'
 SET @@global.event_scheduler = @start_value;
 SELECT @@global.event_scheduler;
 @@global.event_scheduler
diff --git a/mysql-test/suite/sys_vars/r/expire_logs_days_basic.result b/mysql-test/suite/sys_vars/r/expire_logs_days_basic.result
index 63bf9285e72..046520ae49c 100644
--- a/mysql-test/suite/sys_vars/r/expire_logs_days_basic.result
+++ b/mysql-test/suite/sys_vars/r/expire_logs_days_basic.result
@@ -112,9 +112,9 @@ SELECT @@expire_logs_days;
 @@expire_logs_days
 1.000000
 SELECT local.expire_logs_days;
-ERROR 42S02: Unknown table 'local' in field list
+ERROR 42S02: Unknown table 'local' in SELECT
 SELECT global.expire_logs_days;
-ERROR 42S02: Unknown table 'global' in field list
+ERROR 42S02: Unknown table 'global' in SELECT
 SELECT expire_logs_days = @@session.expire_logs_days;
-ERROR 42S22: Unknown column 'expire_logs_days' in 'field list'
+ERROR 42S22: Unknown column 'expire_logs_days' in 'SELECT'
 SET @@global.expire_logs_days = @start_value;
diff --git a/mysql-test/suite/sys_vars/r/flush_basic.result b/mysql-test/suite/sys_vars/r/flush_basic.result
index 78a2875f89e..028ae3f3643 100644
--- a/mysql-test/suite/sys_vars/r/flush_basic.result
+++ b/mysql-test/suite/sys_vars/r/flush_basic.result
@@ -84,9 +84,9 @@ SELECT @@flush = @@global.flush;
 SET flush = 1;
 ERROR HY000: Variable 'flush' is a GLOBAL variable and should be set with SET GLOBAL
 SELECT global.flush;
-ERROR 42S02: Unknown table 'global' in field list
+ERROR 42S02: Unknown table 'global' in SELECT
 SELECT flush = @@session.flush;
-ERROR 42S22: Unknown column 'flush' in 'field list'
+ERROR 42S22: Unknown column 'flush' in 'SELECT'
 SET @@global.flush = @start_value;
 SELECT @@global.flush;
 @@global.flush
diff --git a/mysql-test/suite/sys_vars/r/foreign_key_checks_basic.result b/mysql-test/suite/sys_vars/r/foreign_key_checks_basic.result
index 0bf9d859d40..d1d4c78e426 100644
--- a/mysql-test/suite/sys_vars/r/foreign_key_checks_basic.result
+++ b/mysql-test/suite/sys_vars/r/foreign_key_checks_basic.result
@@ -14,9 +14,9 @@ SELECT @@foreign_key_checks;
 @@foreign_key_checks
 1
 SELECT session.foreign_key_checks;
-ERROR 42S02: Unknown table 'session' in field list
+ERROR 42S02: Unknown table 'session' in SELECT
 SELECT local.foreign_key_checks;
-ERROR 42S02: Unknown table 'local' in field list
+ERROR 42S02: Unknown table 'local' in SELECT
 SET session foreign_key_checks = 0;
 SELECT @@session.foreign_key_checks;
 @@session.foreign_key_checks
diff --git a/mysql-test/suite/sys_vars/r/ft_boolean_syntax_basic.result b/mysql-test/suite/sys_vars/r/ft_boolean_syntax_basic.result
index fc83ea5cf92..e514638eda9 100644
--- a/mysql-test/suite/sys_vars/r/ft_boolean_syntax_basic.result
+++ b/mysql-test/suite/sys_vars/r/ft_boolean_syntax_basic.result
@@ -4,7 +4,7 @@ SELECT @global_start_value;
 + -><()~*:""&|
 '#--------------------FN_DYNVARS_033_01------------------#'
 SELECT ft_boolean_syntax;
-ERROR 42S22: Unknown column 'ft_boolean_syntax' in 'field list'
+ERROR 42S22: Unknown column 'ft_boolean_syntax' in 'SELECT'
 SELECT @@ft_boolean_syntax;
 @@ft_boolean_syntax
 + -><()~*:""&|
@@ -14,7 +14,7 @@ SELECT @@global.ft_boolean_syntax;
 + -><()~*:""&|
 SET global ft_boolean_syntax='$ -><()`*:""&|';
 SELECT global ft_boolean_syntax;
-ERROR 42S22: Unknown column 'global' in 'field list'
+ERROR 42S22: Unknown column 'global' in 'SELECT'
 '#--------------------FN_DYNVARS_033_02-------------------------#'
 SET @@global.ft_boolean_syntax = '# -><()!*:""&|';
 SET @@global.ft_boolean_syntax = DEFAULT;
diff --git a/mysql-test/suite/sys_vars/r/general_log_basic.result b/mysql-test/suite/sys_vars/r/general_log_basic.result
index fe8e08e5e3b..dbe0e60515b 100644
--- a/mysql-test/suite/sys_vars/r/general_log_basic.result
+++ b/mysql-test/suite/sys_vars/r/general_log_basic.result
@@ -79,11 +79,11 @@ SELECT @@general_log = @@global.general_log;
 SET general_log = ON;
 ERROR HY000: Variable 'general_log' is a GLOBAL variable and should be set with SET GLOBAL
 SELECT local.general_log;
-ERROR 42S02: Unknown table 'local' in field list
+ERROR 42S02: Unknown table 'local' in SELECT
 SELECT global.general_log;
-ERROR 42S02: Unknown table 'global' in field list
+ERROR 42S02: Unknown table 'global' in SELECT
 SELECT general_log = @@session.general_log;
-ERROR 42S22: Unknown column 'general_log' in 'field list'
+ERROR 42S22: Unknown column 'general_log' in 'SELECT'
 SET @@global.general_log = @start_value;
 SELECT @@global.general_log;
 @@global.general_log
diff --git a/mysql-test/suite/sys_vars/r/group_concat_max_len_basic.result b/mysql-test/suite/sys_vars/r/group_concat_max_len_basic.result
index fa1cc5554b0..11a19ed6b56 100644
--- a/mysql-test/suite/sys_vars/r/group_concat_max_len_basic.result
+++ b/mysql-test/suite/sys_vars/r/group_concat_max_len_basic.result
@@ -152,11 +152,11 @@ SELECT @@group_concat_max_len;
 @@group_concat_max_len
 4
 SELECT local.group_concat_max_len;
-ERROR 42S02: Unknown table 'local' in field list
+ERROR 42S02: Unknown table 'local' in SELECT
 SELECT session.group_concat_max_len;
-ERROR 42S02: Unknown table 'session' in field list
+ERROR 42S02: Unknown table 'session' in SELECT
 SELECT group_concat_max_len = @@session.group_concat_max_len;
-ERROR 42S22: Unknown column 'group_concat_max_len' in 'field list'
+ERROR 42S22: Unknown column 'group_concat_max_len' in 'SELECT'
 SET @@global.group_concat_max_len = @start_global_value;
 SELECT @@global.group_concat_max_len;
 @@global.group_concat_max_len
diff --git a/mysql-test/suite/sys_vars/r/have_compress_basic.result b/mysql-test/suite/sys_vars/r/have_compress_basic.result
index 9b48d0c4dff..671a7ac5346 100644
--- a/mysql-test/suite/sys_vars/r/have_compress_basic.result
+++ b/mysql-test/suite/sys_vars/r/have_compress_basic.result
@@ -49,5 +49,5 @@ COUNT(@@GLOBAL.have_compress)
 1
 1 Expected
 SELECT have_compress = @@SESSION.have_compress;
-ERROR 42S22: Unknown column 'have_compress' in 'field list'
+ERROR 42S22: Unknown column 'have_compress' in 'SELECT'
 Expected error 'Readonly variable'
diff --git a/mysql-test/suite/sys_vars/r/have_crypt_basic.result b/mysql-test/suite/sys_vars/r/have_crypt_basic.result
index 3a3c221290b..3e5667a608c 100644
--- a/mysql-test/suite/sys_vars/r/have_crypt_basic.result
+++ b/mysql-test/suite/sys_vars/r/have_crypt_basic.result
@@ -49,5 +49,5 @@ COUNT(@@GLOBAL.have_crypt)
 1
 1 Expected
 SELECT have_crypt = @@SESSION.have_crypt;
-ERROR 42S22: Unknown column 'have_crypt' in 'field list'
+ERROR 42S22: Unknown column 'have_crypt' in 'SELECT'
 Expected error 'Readonly variable'
diff --git a/mysql-test/suite/sys_vars/r/have_csv_basic.result b/mysql-test/suite/sys_vars/r/have_csv_basic.result
deleted file mode 100644
index 3427d633f98..00000000000
--- a/mysql-test/suite/sys_vars/r/have_csv_basic.result
+++ /dev/null
@@ -1,53 +0,0 @@
-'#---------------------BS_STVARS_008_01----------------------#'
-SELECT COUNT(@@GLOBAL.have_csv);
-COUNT(@@GLOBAL.have_csv)
-1
-1 Expected
-'#---------------------BS_STVARS_008_02----------------------#'
-SET @@GLOBAL.have_csv=1;
-ERROR HY000: Variable 'have_csv' is a read only variable
-Expected error 'Read only variable'
-SELECT COUNT(@@GLOBAL.have_csv);
-COUNT(@@GLOBAL.have_csv)
-1
-1 Expected
-'#---------------------BS_STVARS_008_03----------------------#'
-SELECT @@GLOBAL.have_csv = VARIABLE_VALUE
-FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES
-WHERE VARIABLE_NAME='have_csv';
-@@GLOBAL.have_csv = VARIABLE_VALUE
-1
-1 Expected
-SELECT COUNT(@@GLOBAL.have_csv);
-COUNT(@@GLOBAL.have_csv)
-1
-1 Expected
-SELECT COUNT(VARIABLE_VALUE)
-FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES 
-WHERE VARIABLE_NAME='have_csv';
-COUNT(VARIABLE_VALUE)
-1
-1 Expected
-'#---------------------BS_STVARS_008_04----------------------#'
-SELECT @@have_csv = @@GLOBAL.have_csv;
-@@have_csv = @@GLOBAL.have_csv
-1
-1 Expected
-'#---------------------BS_STVARS_008_05----------------------#'
-SELECT COUNT(@@have_csv);
-COUNT(@@have_csv)
-1
-1 Expected
-SELECT COUNT(@@local.have_csv);
-ERROR HY000: Variable 'have_csv' is a GLOBAL variable
-Expected error 'Variable is a GLOBAL variable'
-SELECT COUNT(@@SESSION.have_csv);
-ERROR HY000: Variable 'have_csv' is a GLOBAL variable
-Expected error 'Variable is a GLOBAL variable'
-SELECT COUNT(@@GLOBAL.have_csv);
-COUNT(@@GLOBAL.have_csv)
-1
-1 Expected
-SELECT have_csv = @@SESSION.have_csv;
-ERROR 42S22: Unknown column 'have_csv' in 'field list'
-Expected error 'Readonly variable'
diff --git a/mysql-test/suite/sys_vars/r/have_dynamic_loading_basic.result b/mysql-test/suite/sys_vars/r/have_dynamic_loading_basic.result
index fba43958a69..d34d33227aa 100644
--- a/mysql-test/suite/sys_vars/r/have_dynamic_loading_basic.result
+++ b/mysql-test/suite/sys_vars/r/have_dynamic_loading_basic.result
@@ -49,5 +49,5 @@ COUNT(@@GLOBAL.have_dynamic_loading)
 1
 1 Expected
 SELECT have_dynamic_loading = @@SESSION.have_dynamic_loading;
-ERROR 42S22: Unknown column 'have_dynamic_loading' in 'field list'
+ERROR 42S22: Unknown column 'have_dynamic_loading' in 'SELECT'
 Expected error 'Readonly variable'
diff --git a/mysql-test/suite/sys_vars/r/have_geometry_basic.result b/mysql-test/suite/sys_vars/r/have_geometry_basic.result
index 1d5a379c7bc..da340c261cf 100644
--- a/mysql-test/suite/sys_vars/r/have_geometry_basic.result
+++ b/mysql-test/suite/sys_vars/r/have_geometry_basic.result
@@ -49,5 +49,5 @@ COUNT(@@GLOBAL.have_geometry)
 1
 1 Expected
 SELECT have_geometry = @@SESSION.have_geometry;
-ERROR 42S22: Unknown column 'have_geometry' in 'field list'
+ERROR 42S22: Unknown column 'have_geometry' in 'SELECT'
 Expected error 'Readonly variable'
diff --git a/mysql-test/suite/sys_vars/r/have_innodb_basic.result b/mysql-test/suite/sys_vars/r/have_innodb_basic.result
deleted file mode 100644
index 017512f3ae0..00000000000
--- a/mysql-test/suite/sys_vars/r/have_innodb_basic.result
+++ /dev/null
@@ -1,53 +0,0 @@
-'#---------------------BS_STVARS_011_01----------------------#'
-SELECT COUNT(@@GLOBAL.have_innodb);
-COUNT(@@GLOBAL.have_innodb)
-1
-1 Expected
-'#---------------------BS_STVARS_011_02----------------------#'
-SET @@GLOBAL.have_innodb=1;
-ERROR HY000: Variable 'have_innodb' is a read only variable
-Expected error 'Read only variable'
-SELECT COUNT(@@GLOBAL.have_innodb);
-COUNT(@@GLOBAL.have_innodb)
-1
-1 Expected
-'#---------------------BS_STVARS_011_03----------------------#'
-SELECT @@GLOBAL.have_innodb = VARIABLE_VALUE
-FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES
-WHERE VARIABLE_NAME='have_innodb';
-@@GLOBAL.have_innodb = VARIABLE_VALUE
-1
-1 Expected
-SELECT COUNT(@@GLOBAL.have_innodb);
-COUNT(@@GLOBAL.have_innodb)
-1
-1 Expected
-SELECT COUNT(VARIABLE_VALUE)
-FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES 
-WHERE VARIABLE_NAME='have_innodb';
-COUNT(VARIABLE_VALUE)
-1
-1 Expected
-'#---------------------BS_STVARS_011_04----------------------#'
-SELECT @@have_innodb = @@GLOBAL.have_innodb;
-@@have_innodb = @@GLOBAL.have_innodb
-1
-1 Expected
-'#---------------------BS_STVARS_011_05----------------------#'
-SELECT COUNT(@@have_innodb);
-COUNT(@@have_innodb)
-1
-1 Expected
-SELECT COUNT(@@local.have_innodb);
-ERROR HY000: Variable 'have_innodb' is a GLOBAL variable
-Expected error 'Variable is a GLOBAL variable'
-SELECT COUNT(@@SESSION.have_innodb);
-ERROR HY000: Variable 'have_innodb' is a GLOBAL variable
-Expected error 'Variable is a GLOBAL variable'
-SELECT COUNT(@@GLOBAL.have_innodb);
-COUNT(@@GLOBAL.have_innodb)
-1
-1 Expected
-SELECT have_innodb = @@SESSION.have_innodb;
-ERROR 42S22: Unknown column 'have_innodb' in 'field list'
-Expected error 'Readonly variable'
diff --git a/mysql-test/suite/sys_vars/r/have_openssl_basic.result b/mysql-test/suite/sys_vars/r/have_openssl_basic.result
index 1fce883a02f..0943c07740f 100644
--- a/mysql-test/suite/sys_vars/r/have_openssl_basic.result
+++ b/mysql-test/suite/sys_vars/r/have_openssl_basic.result
@@ -49,5 +49,5 @@ COUNT(@@GLOBAL.have_openssl)
 1
 1 Expected
 SELECT have_openssl = @@SESSION.have_openssl;
-ERROR 42S22: Unknown column 'have_openssl' in 'field list'
+ERROR 42S22: Unknown column 'have_openssl' in 'SELECT'
 Expected error 'Readonly variable'
diff --git a/mysql-test/suite/sys_vars/r/have_query_cache_basic.result b/mysql-test/suite/sys_vars/r/have_query_cache_basic.result
index 4baca716698..54028108303 100644
--- a/mysql-test/suite/sys_vars/r/have_query_cache_basic.result
+++ b/mysql-test/suite/sys_vars/r/have_query_cache_basic.result
@@ -49,5 +49,5 @@ COUNT(@@GLOBAL.have_query_cache)
 1
 1 Expected
 SELECT have_query_cache = @@SESSION.have_query_cache;
-ERROR 42S22: Unknown column 'have_query_cache' in 'field list'
+ERROR 42S22: Unknown column 'have_query_cache' in 'SELECT'
 Expected error 'Readonly variable'
diff --git a/mysql-test/suite/sys_vars/r/have_rtree_keys_basic.result b/mysql-test/suite/sys_vars/r/have_rtree_keys_basic.result
index 7d34f1faaed..72304d93ce4 100644
--- a/mysql-test/suite/sys_vars/r/have_rtree_keys_basic.result
+++ b/mysql-test/suite/sys_vars/r/have_rtree_keys_basic.result
@@ -49,5 +49,5 @@ COUNT(@@GLOBAL.have_rtree_keys)
 1
 1 Expected
 SELECT have_rtree_keys = @@SESSION.have_rtree_keys;
-ERROR 42S22: Unknown column 'have_rtree_keys' in 'field list'
+ERROR 42S22: Unknown column 'have_rtree_keys' in 'SELECT'
 Expected error 'Readonly variable'
diff --git a/mysql-test/suite/sys_vars/r/have_ssl_basic.result b/mysql-test/suite/sys_vars/r/have_ssl_basic.result
index a425363c03c..72ed94174cc 100644
--- a/mysql-test/suite/sys_vars/r/have_ssl_basic.result
+++ b/mysql-test/suite/sys_vars/r/have_ssl_basic.result
@@ -49,5 +49,5 @@ COUNT(@@GLOBAL.have_ssl)
 1
 1 Expected
 SELECT have_ssl = @@SESSION.have_ssl;
-ERROR 42S22: Unknown column 'have_ssl' in 'field list'
+ERROR 42S22: Unknown column 'have_ssl' in 'SELECT'
 Expected error 'Readonly variable'
diff --git a/mysql-test/suite/sys_vars/r/have_symlink_basic.result b/mysql-test/suite/sys_vars/r/have_symlink_basic.result
index 999cbb66519..195600e9f10 100644
--- a/mysql-test/suite/sys_vars/r/have_symlink_basic.result
+++ b/mysql-test/suite/sys_vars/r/have_symlink_basic.result
@@ -49,5 +49,5 @@ COUNT(@@GLOBAL.have_symlink)
 1
 1 Expected
 SELECT have_symlink = @@SESSION.have_symlink;
-ERROR 42S22: Unknown column 'have_symlink' in 'field list'
+ERROR 42S22: Unknown column 'have_symlink' in 'SELECT'
 Expected error 'Readonly variable'
diff --git a/mysql-test/suite/sys_vars/r/hostname_basic.result b/mysql-test/suite/sys_vars/r/hostname_basic.result
index c4357a4fbb4..cb52e35040a 100644
--- a/mysql-test/suite/sys_vars/r/hostname_basic.result
+++ b/mysql-test/suite/sys_vars/r/hostname_basic.result
@@ -49,5 +49,5 @@ COUNT(@@GLOBAL.hostname)
 1
 1 Expected
 SELECT hostname = @@SESSION.hostname;
-ERROR 42S22: Unknown column 'hostname' in 'field list'
+ERROR 42S22: Unknown column 'hostname' in 'SELECT'
 Expected error 'Readonly variable'
diff --git a/mysql-test/suite/sys_vars/r/identity_basic.result b/mysql-test/suite/sys_vars/r/identity_basic.result
index 6238f7db3b8..2a6d400c3f4 100644
--- a/mysql-test/suite/sys_vars/r/identity_basic.result
+++ b/mysql-test/suite/sys_vars/r/identity_basic.result
@@ -109,11 +109,11 @@ SELECT @@identity;
 @@identity
 1
 SELECT local.identity;
-ERROR 42S02: Unknown table 'local' in field list
+ERROR 42S02: Unknown table 'local' in SELECT
 SELECT session.identity;
-ERROR 42S02: Unknown table 'session' in field list
+ERROR 42S02: Unknown table 'session' in SELECT
 SELECT identity = @@session.identity;
-ERROR 42S22: Unknown column 'identity' in 'field list'
+ERROR 42S22: Unknown column 'identity' in 'SELECT'
 SET @@session.identity = @start_value;
 SELECT @@session.identity;
 @@session.identity
diff --git a/mysql-test/suite/sys_vars/r/init_connect_basic.result b/mysql-test/suite/sys_vars/r/init_connect_basic.result
index 0992fae67fe..47ecced6c03 100644
Binary files a/mysql-test/suite/sys_vars/r/init_connect_basic.result and b/mysql-test/suite/sys_vars/r/init_connect_basic.result differ
diff --git a/mysql-test/suite/sys_vars/r/init_slave_basic.result b/mysql-test/suite/sys_vars/r/init_slave_basic.result
index 5f9b0a50e26..b3229ec370b 100644
--- a/mysql-test/suite/sys_vars/r/init_slave_basic.result
+++ b/mysql-test/suite/sys_vars/r/init_slave_basic.result
@@ -4,7 +4,7 @@ INIT_VALUE
 
 '#--------------------FN_DYNVARS_037_01------------------#'
 SELECT init_slave;
-ERROR 42S22: Unknown column 'init_slave' in 'field list'
+ERROR 42S22: Unknown column 'init_slave' in 'SELECT'
 SELECT @@init_slave;
 @@init_slave
 
@@ -14,7 +14,7 @@ SELECT @@global.init_slave;
 SET autocomit=0
 SET global init_slave='SET autocomit=0';
 SELECT global init_slave;
-ERROR 42S22: Unknown column 'global' in 'field list'
+ERROR 42S22: Unknown column 'global' in 'SELECT'
 SELECT @@global init_slave;
 ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'init_slave' at line 1
 '#--------------------FN_DYNVARS_037_02-------------------------#'
diff --git a/mysql-test/suite/sys_vars/r/innodb_adaptive_flushing_lwm_basic.result b/mysql-test/suite/sys_vars/r/innodb_adaptive_flushing_lwm_basic.result
index bfd59cfd9cc..85a8ffe7eee 100644
--- a/mysql-test/suite/sys_vars/r/innodb_adaptive_flushing_lwm_basic.result
+++ b/mysql-test/suite/sys_vars/r/innodb_adaptive_flushing_lwm_basic.result
@@ -15,7 +15,7 @@ SELECT @@innodb_adaptive_flushing_lwm;
 @@innodb_adaptive_flushing_lwm
 10.000000
 SELECT local.innodb_adaptive_flushing_lwm;
-ERROR 42S02: Unknown table 'local' in field list
+ERROR 42S02: Unknown table 'local' in SELECT
 SET global innodb_adaptive_flushing_lwm = 1;
 SELECT @@global.innodb_adaptive_flushing_lwm;
 @@global.innodb_adaptive_flushing_lwm
diff --git a/mysql-test/suite/sys_vars/r/innodb_adaptive_hash_index_parts_basic.result b/mysql-test/suite/sys_vars/r/innodb_adaptive_hash_index_parts_basic.result
index 965e2efedf3..9510b387b34 100644
--- a/mysql-test/suite/sys_vars/r/innodb_adaptive_hash_index_parts_basic.result
+++ b/mysql-test/suite/sys_vars/r/innodb_adaptive_hash_index_parts_basic.result
@@ -44,5 +44,5 @@ COUNT(@@GLOBAL.innodb_adaptive_hash_index_parts)
 1
 1 Expected
 SELECT innodb_adaptive_hash_index_parts = @@SESSION.innodb_adaptive_hash_index_parts;
-ERROR 42S22: Unknown column 'innodb_adaptive_hash_index_parts' in 'field list'
+ERROR 42S22: Unknown column 'innodb_adaptive_hash_index_parts' in 'SELECT'
 Expected error 'Readonly variable'
diff --git a/mysql-test/suite/sys_vars/r/innodb_autoextend_increment_basic.result b/mysql-test/suite/sys_vars/r/innodb_autoextend_increment_basic.result
index 6bcca056278..980f2f07a5b 100644
--- a/mysql-test/suite/sys_vars/r/innodb_autoextend_increment_basic.result
+++ b/mysql-test/suite/sys_vars/r/innodb_autoextend_increment_basic.result
@@ -14,7 +14,7 @@ SELECT @@innodb_autoextend_increment ;
 @@innodb_autoextend_increment
 64
 SELECT local.innodb_autoextend_increment ;
-ERROR 42S02: Unknown table 'local' in field list
+ERROR 42S02: Unknown table 'local' in SELECT
 SET global innodb_autoextend_increment  = 0;
 Warnings:
 Warning	1292	Truncated incorrect innodb_autoextend_increment value: '0'
diff --git a/mysql-test/suite/sys_vars/r/innodb_autoinc_lock_mode_basic.result b/mysql-test/suite/sys_vars/r/innodb_autoinc_lock_mode_basic.result
index 9188cf07417..3fe3eeff9bb 100644
--- a/mysql-test/suite/sys_vars/r/innodb_autoinc_lock_mode_basic.result
+++ b/mysql-test/suite/sys_vars/r/innodb_autoinc_lock_mode_basic.result
@@ -15,7 +15,7 @@ SELECT @@innodb_autoinc_lock_mode;
 @@innodb_autoinc_lock_mode
 1
 SELECT local.innodb_autoinc_lock_mode;
-ERROR 42S02: Unknown table 'local' in field list
+ERROR 42S02: Unknown table 'local' in SELECT
 SELECT @@global.innodb_autoinc_lock_mode;
 @@global.innodb_autoinc_lock_mode
 1
diff --git a/mysql-test/suite/sys_vars/r/innodb_buffer_pool_chunk_size_basic.result b/mysql-test/suite/sys_vars/r/innodb_buffer_pool_chunk_size_basic.result
index e9fd5519066..4995543eac9 100644
--- a/mysql-test/suite/sys_vars/r/innodb_buffer_pool_chunk_size_basic.result
+++ b/mysql-test/suite/sys_vars/r/innodb_buffer_pool_chunk_size_basic.result
@@ -44,5 +44,5 @@ COUNT(@@GLOBAL.innodb_buffer_pool_chunk_size)
 1
 1 Expected
 SELECT innodb_buffer_pool_chunk_size = @@SESSION.innodb_buffer_pool_chunk_size;
-ERROR 42S22: Unknown column 'innodb_buffer_pool_chunk_size' in 'field list'
+ERROR 42S22: Unknown column 'innodb_buffer_pool_chunk_size' in 'SELECT'
 Expected error 'Readonly variable'
diff --git a/mysql-test/suite/sys_vars/r/innodb_buffer_pool_size_basic.result b/mysql-test/suite/sys_vars/r/innodb_buffer_pool_size_basic.result
index 6c5068956b9..e5dd6820420 100644
--- a/mysql-test/suite/sys_vars/r/innodb_buffer_pool_size_basic.result
+++ b/mysql-test/suite/sys_vars/r/innodb_buffer_pool_size_basic.result
@@ -49,5 +49,5 @@ COUNT(@@GLOBAL.innodb_buffer_pool_size)
 1
 1 Expected
 SELECT innodb_buffer_pool_size = @@SESSION.innodb_buffer_pool_size;
-ERROR 42S22: Unknown column 'innodb_buffer_pool_size' in 'field list'
+ERROR 42S22: Unknown column 'innodb_buffer_pool_size' in 'SELECT'
 # restart
diff --git a/mysql-test/suite/sys_vars/r/innodb_compression_failure_threshold_pct_basic.result b/mysql-test/suite/sys_vars/r/innodb_compression_failure_threshold_pct_basic.result
index 3a5eb46df68..1ad1395af75 100644
--- a/mysql-test/suite/sys_vars/r/innodb_compression_failure_threshold_pct_basic.result
+++ b/mysql-test/suite/sys_vars/r/innodb_compression_failure_threshold_pct_basic.result
@@ -15,7 +15,7 @@ SELECT @@innodb_compression_failure_threshold_pct;
 @@innodb_compression_failure_threshold_pct
 5
 SELECT local.innodb_compression_failure_threshold_pct;
-ERROR 42S02: Unknown table 'local' in field list
+ERROR 42S02: Unknown table 'local' in SELECT
 SET global innodb_compression_failure_threshold_pct = 0;
 SELECT @@global.innodb_compression_failure_threshold_pct;
 @@global.innodb_compression_failure_threshold_pct
diff --git a/mysql-test/suite/sys_vars/r/innodb_compression_pad_pct_max_basic.result b/mysql-test/suite/sys_vars/r/innodb_compression_pad_pct_max_basic.result
index 6735d877c6b..9a471e640dd 100644
--- a/mysql-test/suite/sys_vars/r/innodb_compression_pad_pct_max_basic.result
+++ b/mysql-test/suite/sys_vars/r/innodb_compression_pad_pct_max_basic.result
@@ -14,7 +14,7 @@ SELECT @@innodb_compression_pad_pct_max;
 @@innodb_compression_pad_pct_max
 50
 SELECT local.innodb_compression_pad_pct_max;
-ERROR 42S02: Unknown table 'local' in field list
+ERROR 42S02: Unknown table 'local' in SELECT
 SET global innodb_compression_pad_pct_max = 0;
 SELECT @@global.innodb_compression_pad_pct_max;
 @@global.innodb_compression_pad_pct_max
diff --git a/mysql-test/suite/sys_vars/r/innodb_data_file_path_basic.result b/mysql-test/suite/sys_vars/r/innodb_data_file_path_basic.result
index 8904c0dcac4..d9eae0733b0 100644
--- a/mysql-test/suite/sys_vars/r/innodb_data_file_path_basic.result
+++ b/mysql-test/suite/sys_vars/r/innodb_data_file_path_basic.result
@@ -49,5 +49,5 @@ COUNT(@@GLOBAL.innodb_data_file_path)
 1
 1 Expected
 SELECT innodb_data_file_path = @@SESSION.innodb_data_file_path;
-ERROR 42S22: Unknown column 'innodb_data_file_path' in 'field list'
+ERROR 42S22: Unknown column 'innodb_data_file_path' in 'SELECT'
 Expected error 'Readonly variable'
diff --git a/mysql-test/suite/sys_vars/r/innodb_data_home_dir_basic.result b/mysql-test/suite/sys_vars/r/innodb_data_home_dir_basic.result
index 52a97bb6c95..21828df54ff 100644
--- a/mysql-test/suite/sys_vars/r/innodb_data_home_dir_basic.result
+++ b/mysql-test/suite/sys_vars/r/innodb_data_home_dir_basic.result
@@ -49,5 +49,5 @@ COUNT(@@GLOBAL.innodb_data_home_dir)
 0
 0 Expected
 SELECT innodb_data_home_dir = @@SESSION.innodb_data_home_dir;
-ERROR 42S22: Unknown column 'innodb_data_home_dir' in 'field list'
+ERROR 42S22: Unknown column 'innodb_data_home_dir' in 'SELECT'
 Expected error 'Readonly variable'
diff --git a/mysql-test/suite/sys_vars/r/innodb_doublewrite_basic.result b/mysql-test/suite/sys_vars/r/innodb_doublewrite_basic.result
index 4a5baf0aeda..460a114a7ed 100644
--- a/mysql-test/suite/sys_vars/r/innodb_doublewrite_basic.result
+++ b/mysql-test/suite/sys_vars/r/innodb_doublewrite_basic.result
@@ -49,5 +49,5 @@ COUNT(@@GLOBAL.innodb_doublewrite)
 1
 1 Expected
 SELECT innodb_doublewrite = @@SESSION.innodb_doublewrite;
-ERROR 42S22: Unknown column 'innodb_doublewrite' in 'field list'
+ERROR 42S22: Unknown column 'innodb_doublewrite' in 'SELECT'
 Expected error 'Readonly variable'
diff --git a/mysql-test/suite/sys_vars/r/innodb_encrypt_log_basic.result b/mysql-test/suite/sys_vars/r/innodb_encrypt_log_basic.result
index 4beb1a01edf..29d95b1bc77 100644
--- a/mysql-test/suite/sys_vars/r/innodb_encrypt_log_basic.result
+++ b/mysql-test/suite/sys_vars/r/innodb_encrypt_log_basic.result
@@ -44,5 +44,5 @@ SELECT @@GLOBAL.innodb_encrypt_log;
 0
 0 Expected
 SELECT innodb_encrypt_log;
-ERROR 42S22: Unknown column 'innodb_encrypt_log' in 'field list'
+ERROR 42S22: Unknown column 'innodb_encrypt_log' in 'SELECT'
 Expected error 'Unknown column in field list'
diff --git a/mysql-test/suite/sys_vars/r/innodb_fast_shutdown_basic.result b/mysql-test/suite/sys_vars/r/innodb_fast_shutdown_basic.result
index 7d0b48f2947..4b1f5ea2a4c 100644
--- a/mysql-test/suite/sys_vars/r/innodb_fast_shutdown_basic.result
+++ b/mysql-test/suite/sys_vars/r/innodb_fast_shutdown_basic.result
@@ -15,7 +15,7 @@ SELECT @@innodb_fast_shutdown;
 @@innodb_fast_shutdown
 1
 SELECT global.innodb_fast_shutdown;
-ERROR 42S02: Unknown table 'global' in field list
+ERROR 42S02: Unknown table 'global' in SELECT
 SET global innodb_fast_shutdown = 1;
 SELECT @@global.innodb_fast_shutdown;
 @@global.innodb_fast_shutdown
diff --git a/mysql-test/suite/sys_vars/r/innodb_file_io_threads_basic.result b/mysql-test/suite/sys_vars/r/innodb_file_io_threads_basic.result
index 5ef7e1099e0..f67e5de1327 100644
--- a/mysql-test/suite/sys_vars/r/innodb_file_io_threads_basic.result
+++ b/mysql-test/suite/sys_vars/r/innodb_file_io_threads_basic.result
@@ -80,7 +80,7 @@ COUNT(@@GLOBAL.innodb_read_io_threads)
 1
 1 Expected
 SELECT innodb_read_io_threads = @@SESSION.innodb_read_io_threads;
-ERROR 42S22: Unknown column 'innodb_read_io_threads' in 'field list'
+ERROR 42S22: Unknown column 'innodb_read_io_threads' in 'SELECT'
 Expected error 'Readonly variable'
 SELECT COUNT(@@innodb_write_io_threads);
 COUNT(@@innodb_write_io_threads)
@@ -97,5 +97,5 @@ COUNT(@@GLOBAL.innodb_write_io_threads)
 1
 1 Expected
 SELECT innodb_write_io_threads = @@SESSION.innodb_write_io_threads;
-ERROR 42S22: Unknown column 'innodb_write_io_threads' in 'field list'
+ERROR 42S22: Unknown column 'innodb_write_io_threads' in 'SELECT'
 Expected error 'Readonly variable'
diff --git a/mysql-test/suite/sys_vars/r/innodb_file_per_table_basic.result b/mysql-test/suite/sys_vars/r/innodb_file_per_table_basic.result
index 9780357e69f..65bf0750210 100644
--- a/mysql-test/suite/sys_vars/r/innodb_file_per_table_basic.result
+++ b/mysql-test/suite/sys_vars/r/innodb_file_per_table_basic.result
@@ -62,7 +62,7 @@ COUNT(@@GLOBAL.innodb_file_per_table)
 1
 1 Expected
 SELECT innodb_file_per_table = @@SESSION.innodb_file_per_table;
-ERROR 42S22: Unknown column 'innodb_file_per_table' in 'field list'
+ERROR 42S22: Unknown column 'innodb_file_per_table' in 'SELECT'
 SET @@global.innodb_file_per_table = @start_global_value;
 SELECT @@global.innodb_file_per_table;
 @@global.innodb_file_per_table
diff --git a/mysql-test/suite/sys_vars/r/innodb_flush_log_at_timeout_basic.result b/mysql-test/suite/sys_vars/r/innodb_flush_log_at_timeout_basic.result
index 79455e22b53..f851d30d5e6 100644
--- a/mysql-test/suite/sys_vars/r/innodb_flush_log_at_timeout_basic.result
+++ b/mysql-test/suite/sys_vars/r/innodb_flush_log_at_timeout_basic.result
@@ -15,7 +15,7 @@ SELECT @@innodb_flush_log_at_timeout;
 @@innodb_flush_log_at_timeout
 1
 SELECT local.innodb_flush_log_at_timeout;
-ERROR 42S02: Unknown table 'local' in field list
+ERROR 42S02: Unknown table 'local' in SELECT
 SET global innodb_flush_log_at_timeout = 0;
 SELECT @@global.innodb_flush_log_at_timeout;
 @@global.innodb_flush_log_at_timeout
diff --git a/mysql-test/suite/sys_vars/r/innodb_flush_log_at_trx_commit_basic.result b/mysql-test/suite/sys_vars/r/innodb_flush_log_at_trx_commit_basic.result
index 0d990d746a9..28153287a5a 100644
--- a/mysql-test/suite/sys_vars/r/innodb_flush_log_at_trx_commit_basic.result
+++ b/mysql-test/suite/sys_vars/r/innodb_flush_log_at_trx_commit_basic.result
@@ -15,7 +15,7 @@ SELECT @@innodb_flush_log_at_trx_commit;
 @@innodb_flush_log_at_trx_commit
 1
 SELECT local.innodb_flush_log_at_trx_commit;
-ERROR 42S02: Unknown table 'local' in field list
+ERROR 42S02: Unknown table 'local' in SELECT
 SET global innodb_flush_log_at_trx_commit = 0;
 SELECT @@global.innodb_flush_log_at_trx_commit;
 @@global.innodb_flush_log_at_trx_commit
diff --git a/mysql-test/suite/sys_vars/r/innodb_flush_method_basic.result b/mysql-test/suite/sys_vars/r/innodb_flush_method_basic.result
index 21d56208141..6992bd6e676 100644
--- a/mysql-test/suite/sys_vars/r/innodb_flush_method_basic.result
+++ b/mysql-test/suite/sys_vars/r/innodb_flush_method_basic.result
@@ -49,5 +49,5 @@ COUNT(@@GLOBAL.innodb_flush_method)
 1
 1 Expected
 SELECT innodb_flush_method = @@SESSION.innodb_flush_method;
-ERROR 42S22: Unknown column 'innodb_flush_method' in 'field list'
+ERROR 42S22: Unknown column 'innodb_flush_method' in 'SELECT'
 Expected error 'Readonly variable'
diff --git a/mysql-test/suite/sys_vars/r/innodb_flushing_avg_loops_basic.result b/mysql-test/suite/sys_vars/r/innodb_flushing_avg_loops_basic.result
index e024581955a..ff7f684eb41 100644
--- a/mysql-test/suite/sys_vars/r/innodb_flushing_avg_loops_basic.result
+++ b/mysql-test/suite/sys_vars/r/innodb_flushing_avg_loops_basic.result
@@ -15,7 +15,7 @@ SELECT @@innodb_flushing_avg_loops;
 @@innodb_flushing_avg_loops
 30
 SELECT local.innodb_flushing_avg_loops;
-ERROR 42S02: Unknown table 'local' in field list
+ERROR 42S02: Unknown table 'local' in SELECT
 SET global innodb_flushing_avg_loops = 1;
 SELECT @@global.innodb_flushing_avg_loops;
 @@global.innodb_flushing_avg_loops
diff --git a/mysql-test/suite/sys_vars/r/innodb_force_recovery_basic.result b/mysql-test/suite/sys_vars/r/innodb_force_recovery_basic.result
index d3dcb525c7f..3a72a3897a8 100644
--- a/mysql-test/suite/sys_vars/r/innodb_force_recovery_basic.result
+++ b/mysql-test/suite/sys_vars/r/innodb_force_recovery_basic.result
@@ -49,5 +49,5 @@ COUNT(@@GLOBAL.innodb_force_recovery)
 1
 1 Expected
 SELECT innodb_force_recovery = @@SESSION.innodb_force_recovery;
-ERROR 42S22: Unknown column 'innodb_force_recovery' in 'field list'
+ERROR 42S22: Unknown column 'innodb_force_recovery' in 'SELECT'
 Expected error 'Readonly variable'
diff --git a/mysql-test/suite/sys_vars/r/innodb_lock_wait_timeout_basic.result b/mysql-test/suite/sys_vars/r/innodb_lock_wait_timeout_basic.result
index fc60f89d72f..1b0c2867ddf 100644
--- a/mysql-test/suite/sys_vars/r/innodb_lock_wait_timeout_basic.result
+++ b/mysql-test/suite/sys_vars/r/innodb_lock_wait_timeout_basic.result
@@ -54,7 +54,7 @@ COUNT(@@GLOBAL.innodb_lock_wait_timeout)
 1
 1 Expected
 SELECT innodb_lock_wait_timeout = @@SESSION.innodb_lock_wait_timeout;
-ERROR 42S22: Unknown column 'innodb_lock_wait_timeout' in 'field list'
+ERROR 42S22: Unknown column 'innodb_lock_wait_timeout' in 'SELECT'
 set @@global.innodb_lock_wait_timeout=100;
 set @@global.innodb_lock_wait_timeout=DEFAULT;
 select @@global.innodb_lock_wait_timeout;
diff --git a/mysql-test/suite/sys_vars/r/innodb_log_buffer_size_basic.result b/mysql-test/suite/sys_vars/r/innodb_log_buffer_size_basic.result
index d926addd1bd..252f5032134 100644
--- a/mysql-test/suite/sys_vars/r/innodb_log_buffer_size_basic.result
+++ b/mysql-test/suite/sys_vars/r/innodb_log_buffer_size_basic.result
@@ -49,5 +49,5 @@ COUNT(@@GLOBAL.innodb_log_buffer_size)
 1
 1 Expected
 SELECT innodb_log_buffer_size = @@SESSION.innodb_log_buffer_size;
-ERROR 42S22: Unknown column 'innodb_log_buffer_size' in 'field list'
+ERROR 42S22: Unknown column 'innodb_log_buffer_size' in 'SELECT'
 Expected error 'Readonly variable'
diff --git a/mysql-test/suite/sys_vars/r/innodb_log_file_size_basic.result b/mysql-test/suite/sys_vars/r/innodb_log_file_size_basic.result
index 119e95df1e1..4ba34b2a83c 100644
--- a/mysql-test/suite/sys_vars/r/innodb_log_file_size_basic.result
+++ b/mysql-test/suite/sys_vars/r/innodb_log_file_size_basic.result
@@ -49,5 +49,5 @@ COUNT(@@GLOBAL.innodb_log_file_size)
 1
 1 Expected
 SELECT innodb_log_file_size = @@SESSION.innodb_log_file_size;
-ERROR 42S22: Unknown column 'innodb_log_file_size' in 'field list'
+ERROR 42S22: Unknown column 'innodb_log_file_size' in 'SELECT'
 Expected error 'Readonly variable'
diff --git a/mysql-test/suite/sys_vars/r/innodb_log_group_home_dir_basic.result b/mysql-test/suite/sys_vars/r/innodb_log_group_home_dir_basic.result
index c7fbd2d958f..35542b4ae7a 100644
--- a/mysql-test/suite/sys_vars/r/innodb_log_group_home_dir_basic.result
+++ b/mysql-test/suite/sys_vars/r/innodb_log_group_home_dir_basic.result
@@ -49,5 +49,5 @@ COUNT(@@GLOBAL.innodb_log_group_home_dir)
 1
 1 Expected
 SELECT innodb_log_group_home_dir = @@SESSION.innodb_log_group_home_dir;
-ERROR 42S22: Unknown column 'innodb_log_group_home_dir' in 'field list'
+ERROR 42S22: Unknown column 'innodb_log_group_home_dir' in 'SELECT'
 Expected error 'Readonly variable'
diff --git a/mysql-test/suite/sys_vars/r/innodb_max_dirty_pages_pct_basic.result b/mysql-test/suite/sys_vars/r/innodb_max_dirty_pages_pct_basic.result
index e83f528a94e..fabd28a5c8d 100644
--- a/mysql-test/suite/sys_vars/r/innodb_max_dirty_pages_pct_basic.result
+++ b/mysql-test/suite/sys_vars/r/innodb_max_dirty_pages_pct_basic.result
@@ -25,7 +25,7 @@ SELECT @@innodb_max_dirty_pages_pct;
 @@innodb_max_dirty_pages_pct
 90.000000
 SELECT local.innodb_max_dirty_pages_pct;
-ERROR 42S02: Unknown table 'local' in field list
+ERROR 42S02: Unknown table 'local' in SELECT
 SET global innodb_max_dirty_pages_pct = 0;
 SELECT @@global.innodb_max_dirty_pages_pct;
 @@global.innodb_max_dirty_pages_pct
diff --git a/mysql-test/suite/sys_vars/r/innodb_max_dirty_pages_pct_lwm_basic.result b/mysql-test/suite/sys_vars/r/innodb_max_dirty_pages_pct_lwm_basic.result
index 641386d5f23..cb98b9e6500 100644
--- a/mysql-test/suite/sys_vars/r/innodb_max_dirty_pages_pct_lwm_basic.result
+++ b/mysql-test/suite/sys_vars/r/innodb_max_dirty_pages_pct_lwm_basic.result
@@ -21,7 +21,7 @@ SELECT @@innodb_max_dirty_pages_pct_lwm;
 @@innodb_max_dirty_pages_pct_lwm
 0.000000
 SELECT local.innodb_max_dirty_pages_pct_lwm;
-ERROR 42S02: Unknown table 'local' in field list
+ERROR 42S02: Unknown table 'local' in SELECT
 SET global innodb_max_dirty_pages_pct_lwm = 0;
 SELECT @@global.innodb_max_dirty_pages_pct_lwm;
 @@global.innodb_max_dirty_pages_pct_lwm
diff --git a/mysql-test/suite/sys_vars/r/innodb_max_purge_lag_basic.result b/mysql-test/suite/sys_vars/r/innodb_max_purge_lag_basic.result
index bf526fc1c3d..b4e5b454806 100644
--- a/mysql-test/suite/sys_vars/r/innodb_max_purge_lag_basic.result
+++ b/mysql-test/suite/sys_vars/r/innodb_max_purge_lag_basic.result
@@ -15,7 +15,7 @@ SELECT @@innodb_max_purge_lag;
 @@innodb_max_purge_lag
 0
 SELECT local.innodb_max_purge_lag;
-ERROR 42S02: Unknown table 'local' in field list
+ERROR 42S02: Unknown table 'local' in SELECT
 SET global innodb_max_purge_lag = 0;
 SELECT @@global.innodb_max_purge_lag;
 @@global.innodb_max_purge_lag
diff --git a/mysql-test/suite/sys_vars/r/innodb_max_purge_lag_delay_basic.result b/mysql-test/suite/sys_vars/r/innodb_max_purge_lag_delay_basic.result
index ae42d16c2ee..9d1dcb2c83a 100644
--- a/mysql-test/suite/sys_vars/r/innodb_max_purge_lag_delay_basic.result
+++ b/mysql-test/suite/sys_vars/r/innodb_max_purge_lag_delay_basic.result
@@ -28,7 +28,7 @@ SELECT COUNT(@@SESSION.innodb_max_purge_lag_delay);
 ERROR HY000: Variable 'innodb_max_purge_lag_delay' is a GLOBAL variable
 Expected error 'Variable is a GLOBAL variable'
 SELECT innodb_max_purge_lag_delay = @@SESSION.innodb_max_purge_lag_delay;
-ERROR 42S22: Unknown column 'innodb_max_purge_lag_delay' in 'field list'
+ERROR 42S22: Unknown column 'innodb_max_purge_lag_delay' in 'SELECT'
 set global innodb_max_purge_lag_delay = -1;
 Warnings:
 Warning	1292	Truncated incorrect innodb_max_purge_lag_delay value: '-1'
diff --git a/mysql-test/suite/sys_vars/r/innodb_open_files_basic.result b/mysql-test/suite/sys_vars/r/innodb_open_files_basic.result
index eac2234270a..3fc8d05ee9e 100644
--- a/mysql-test/suite/sys_vars/r/innodb_open_files_basic.result
+++ b/mysql-test/suite/sys_vars/r/innodb_open_files_basic.result
@@ -49,5 +49,5 @@ COUNT(@@GLOBAL.innodb_open_files)
 1
 1 Expected
 SELECT innodb_open_files = @@SESSION.innodb_open_files;
-ERROR 42S22: Unknown column 'innodb_open_files' in 'field list'
+ERROR 42S22: Unknown column 'innodb_open_files' in 'SELECT'
 Expected error 'Readonly variable'
diff --git a/mysql-test/suite/sys_vars/r/innodb_purge_batch_size_basic.result b/mysql-test/suite/sys_vars/r/innodb_purge_batch_size_basic.result
index f5b01aa8016..8e5ebe06831 100644
--- a/mysql-test/suite/sys_vars/r/innodb_purge_batch_size_basic.result
+++ b/mysql-test/suite/sys_vars/r/innodb_purge_batch_size_basic.result
@@ -15,7 +15,7 @@ SELECT @@innodb_purge_batch_size;
 @@innodb_purge_batch_size
 127
 SELECT local.innodb_purge_batch_size;
-ERROR 42S02: Unknown table 'local' in field list
+ERROR 42S02: Unknown table 'local' in SELECT
 SET global innodb_purge_batch_size = 1;
 SELECT @@global.innodb_purge_batch_size;
 @@global.innodb_purge_batch_size
diff --git a/mysql-test/suite/sys_vars/r/innodb_purge_rseg_truncate_frequency_basic.result b/mysql-test/suite/sys_vars/r/innodb_purge_rseg_truncate_frequency_basic.result
index 8b5ae0fae3e..b9e237f9206 100644
--- a/mysql-test/suite/sys_vars/r/innodb_purge_rseg_truncate_frequency_basic.result
+++ b/mysql-test/suite/sys_vars/r/innodb_purge_rseg_truncate_frequency_basic.result
@@ -19,7 +19,7 @@ SELECT @@innodb_purge_rseg_truncate_frequency;
 @@innodb_purge_rseg_truncate_frequency
 128
 SELECT local.innodb_purge_rseg_truncate_frequency;
-ERROR 42S02: Unknown table 'local' in field list
+ERROR 42S02: Unknown table 'local' in SELECT
 SET global innodb_purge_rseg_truncate_frequency = 1;
 Warnings:
 Warning	1287	'@@innodb_purge_rseg_truncate_frequency' is deprecated and will be removed in a future release
diff --git a/mysql-test/suite/sys_vars/r/innodb_rollback_on_timeout_basic.result b/mysql-test/suite/sys_vars/r/innodb_rollback_on_timeout_basic.result
index 0b7c71ce488..b4b953fa0fe 100644
--- a/mysql-test/suite/sys_vars/r/innodb_rollback_on_timeout_basic.result
+++ b/mysql-test/suite/sys_vars/r/innodb_rollback_on_timeout_basic.result
@@ -49,5 +49,5 @@ COUNT(@@GLOBAL.innodb_rollback_on_timeout)
 1
 1 Expected
 SELECT innodb_rollback_on_timeout = @@SESSION.innodb_rollback_on_timeout;
-ERROR 42S22: Unknown column 'innodb_rollback_on_timeout' in 'field list'
+ERROR 42S22: Unknown column 'innodb_rollback_on_timeout' in 'SELECT'
 Expected error 'Readonly variable'
diff --git a/mysql-test/suite/sys_vars/r/innodb_sync_spin_loops_basic.result b/mysql-test/suite/sys_vars/r/innodb_sync_spin_loops_basic.result
index 3377b690e49..4ccb63d8eff 100644
--- a/mysql-test/suite/sys_vars/r/innodb_sync_spin_loops_basic.result
+++ b/mysql-test/suite/sys_vars/r/innodb_sync_spin_loops_basic.result
@@ -15,7 +15,7 @@ SELECT @@innodb_sync_spin_loops;
 @@innodb_sync_spin_loops
 30
 SELECT local.innodb_sync_spin_loops;
-ERROR 42S02: Unknown table 'local' in field list
+ERROR 42S02: Unknown table 'local' in SELECT
 SET global innodb_sync_spin_loops = 0;
 SELECT @@global.innodb_sync_spin_loops;
 @@global.innodb_sync_spin_loops
diff --git a/mysql-test/suite/sys_vars/r/innodb_table_locks_basic.result b/mysql-test/suite/sys_vars/r/innodb_table_locks_basic.result
index 08dc5d7aaca..f5b232341e2 100644
--- a/mysql-test/suite/sys_vars/r/innodb_table_locks_basic.result
+++ b/mysql-test/suite/sys_vars/r/innodb_table_locks_basic.result
@@ -23,11 +23,11 @@ SELECT @@innodb_table_locks;
 @@innodb_table_locks
 1
 SELECT session.innodb_table_locks;
-ERROR 42S02: Unknown table 'session' in field list
+ERROR 42S02: Unknown table 'session' in SELECT
 SELECT local.innodb_table_locks;
-ERROR 42S02: Unknown table 'local' in field list
+ERROR 42S02: Unknown table 'local' in SELECT
 SELECT global.innodb_table_locks;
-ERROR 42S02: Unknown table 'global' in field list
+ERROR 42S02: Unknown table 'global' in SELECT
 SET session innodb_table_locks = 0;
 SELECT @@session.innodb_table_locks;
 @@session.innodb_table_locks
diff --git a/mysql-test/suite/sys_vars/r/innodb_temp_data_file_path_basic.result b/mysql-test/suite/sys_vars/r/innodb_temp_data_file_path_basic.result
index 2357a07e3ab..4f2690d9987 100644
--- a/mysql-test/suite/sys_vars/r/innodb_temp_data_file_path_basic.result
+++ b/mysql-test/suite/sys_vars/r/innodb_temp_data_file_path_basic.result
@@ -49,5 +49,5 @@ COUNT(@@GLOBAL.innodb_temp_data_file_path)
 1
 1 Expected
 SELECT innodb_temp_data_file_path = @@SESSION.innodb_temp_data_file_path;
-ERROR 42S22: Unknown column 'innodb_temp_data_file_path' in 'field list'
+ERROR 42S22: Unknown column 'innodb_temp_data_file_path' in 'SELECT'
 Expected error 'Readonly variable'
diff --git a/mysql-test/suite/sys_vars/r/innodb_undo_directory_basic.result b/mysql-test/suite/sys_vars/r/innodb_undo_directory_basic.result
index fbafe653d29..48b54bb7876 100644
--- a/mysql-test/suite/sys_vars/r/innodb_undo_directory_basic.result
+++ b/mysql-test/suite/sys_vars/r/innodb_undo_directory_basic.result
@@ -44,5 +44,5 @@ COUNT(@@GLOBAL.innodb_undo_directory)
 1
 1 Expected
 SELECT innodb_undo_directory = @@SESSION.innodb_undo_directory;
-ERROR 42S22: Unknown column 'innodb_undo_directory' in 'field list'
+ERROR 42S22: Unknown column 'innodb_undo_directory' in 'SELECT'
 Expected error 'Readonly variable'
diff --git a/mysql-test/suite/sys_vars/r/innodb_undo_log_truncate_basic.result b/mysql-test/suite/sys_vars/r/innodb_undo_log_truncate_basic.result
index eb42f4965ea..3404effc98b 100644
--- a/mysql-test/suite/sys_vars/r/innodb_undo_log_truncate_basic.result
+++ b/mysql-test/suite/sys_vars/r/innodb_undo_log_truncate_basic.result
@@ -62,7 +62,7 @@ COUNT(@@GLOBAL.innodb_undo_log_truncate)
 1
 1 Expected
 SELECT innodb_undo_log_truncate = @@SESSION.innodb_undo_log_truncate;
-ERROR 42S22: Unknown column 'innodb_undo_log_truncate' in 'field list'
+ERROR 42S22: Unknown column 'innodb_undo_log_truncate' in 'SELECT'
 SET @@global.innodb_undo_log_truncate = @start_global_value;
 SELECT @@global.innodb_undo_log_truncate;
 @@global.innodb_undo_log_truncate
diff --git a/mysql-test/suite/sys_vars/r/innodb_undo_tablespaces_basic.result b/mysql-test/suite/sys_vars/r/innodb_undo_tablespaces_basic.result
index c7e0b21a12b..05db9c1c845 100644
--- a/mysql-test/suite/sys_vars/r/innodb_undo_tablespaces_basic.result
+++ b/mysql-test/suite/sys_vars/r/innodb_undo_tablespaces_basic.result
@@ -30,5 +30,5 @@ COUNT(@@GLOBAL.innodb_undo_tablespaces)
 1
 1 Expected
 SELECT innodb_undo_tablespaces = @@SESSION.innodb_undo_tablespaces;
-ERROR 42S22: Unknown column 'innodb_undo_tablespaces' in 'field list'
+ERROR 42S22: Unknown column 'innodb_undo_tablespaces' in 'SELECT'
 Expected error 'Readonly variable'
diff --git a/mysql-test/suite/sys_vars/r/innodb_use_native_aio_basic.result b/mysql-test/suite/sys_vars/r/innodb_use_native_aio_basic.result
index 2e093a9fd2a..8e2baa39e38 100644
--- a/mysql-test/suite/sys_vars/r/innodb_use_native_aio_basic.result
+++ b/mysql-test/suite/sys_vars/r/innodb_use_native_aio_basic.result
@@ -49,5 +49,5 @@ COUNT(@@GLOBAL.innodb_use_native_aio)
 1
 1 Expected
 SELECT innodb_use_native_aio = @@SESSION.innodb_use_native_aio;
-ERROR 42S22: Unknown column 'innodb_use_native_aio' in 'field list'
+ERROR 42S22: Unknown column 'innodb_use_native_aio' in 'SELECT'
 Expected error 'Readonly variable'
diff --git a/mysql-test/suite/sys_vars/r/insert_id_basic.result b/mysql-test/suite/sys_vars/r/insert_id_basic.result
index f8ae8994120..c04c44bba9d 100644
--- a/mysql-test/suite/sys_vars/r/insert_id_basic.result
+++ b/mysql-test/suite/sys_vars/r/insert_id_basic.result
@@ -109,11 +109,11 @@ SELECT @@insert_id;
 @@insert_id
 1
 SELECT local.insert_id;
-ERROR 42S02: Unknown table 'local' in field list
+ERROR 42S02: Unknown table 'local' in SELECT
 SELECT session.insert_id;
-ERROR 42S02: Unknown table 'session' in field list
+ERROR 42S02: Unknown table 'session' in SELECT
 SELECT insert_id = @@session.insert_id;
-ERROR 42S22: Unknown column 'insert_id' in 'field list'
+ERROR 42S22: Unknown column 'insert_id' in 'SELECT'
 SET @@session.insert_id = @start_value;
 SELECT @@session.insert_id;
 @@session.insert_id
diff --git a/mysql-test/suite/sys_vars/r/interactive_timeout_basic.result b/mysql-test/suite/sys_vars/r/interactive_timeout_basic.result
index 79e90fc24fa..a2f0393c7a2 100644
--- a/mysql-test/suite/sys_vars/r/interactive_timeout_basic.result
+++ b/mysql-test/suite/sys_vars/r/interactive_timeout_basic.result
@@ -148,11 +148,11 @@ SELECT @@interactive_timeout;
 @@interactive_timeout
 1
 SELECT local.interactive_timeout;
-ERROR 42S02: Unknown table 'local' in field list
+ERROR 42S02: Unknown table 'local' in SELECT
 SELECT session.interactive_timeout;
-ERROR 42S02: Unknown table 'session' in field list
+ERROR 42S02: Unknown table 'session' in SELECT
 SELECT interactive_timeout = @@session.interactive_timeout;
-ERROR 42S22: Unknown column 'interactive_timeout' in 'field list'
+ERROR 42S22: Unknown column 'interactive_timeout' in 'SELECT'
 SET @@global.interactive_timeout = @start_global_value;
 SELECT @@global.interactive_timeout;
 @@global.interactive_timeout
diff --git a/mysql-test/suite/sys_vars/r/join_buffer_size_basic.result b/mysql-test/suite/sys_vars/r/join_buffer_size_basic.result
index 0586767b660..b12acdf146f 100644
--- a/mysql-test/suite/sys_vars/r/join_buffer_size_basic.result
+++ b/mysql-test/suite/sys_vars/r/join_buffer_size_basic.result
@@ -158,10 +158,10 @@ SELECT @@join_buffer_size;
 @@join_buffer_size
 128
 SELECT local.join_buffer_size;
-ERROR 42S02: Unknown table 'local' in field list
+ERROR 42S02: Unknown table 'local' in SELECT
 SELECT session.join_buffer_size;
-ERROR 42S02: Unknown table 'session' in field list
+ERROR 42S02: Unknown table 'session' in SELECT
 SELECT join_buffer_size = @@session.join_buffer_size;
-ERROR 42S22: Unknown column 'join_buffer_size' in 'field list'
+ERROR 42S22: Unknown column 'join_buffer_size' in 'SELECT'
 SET @@global.join_buffer_size = @start_global_value;
 SET @@session.join_buffer_size = @start_session_value;
diff --git a/mysql-test/suite/sys_vars/r/keep_files_on_create_basic.result b/mysql-test/suite/sys_vars/r/keep_files_on_create_basic.result
index 01ad4659b46..73a973fa901 100644
--- a/mysql-test/suite/sys_vars/r/keep_files_on_create_basic.result
+++ b/mysql-test/suite/sys_vars/r/keep_files_on_create_basic.result
@@ -148,11 +148,11 @@ SELECT @@keep_files_on_create;
 @@keep_files_on_create
 1
 SELECT local.keep_files_on_create;
-ERROR 42S02: Unknown table 'local' in field list
+ERROR 42S02: Unknown table 'local' in SELECT
 SELECT session.keep_files_on_create;
-ERROR 42S02: Unknown table 'session' in field list
+ERROR 42S02: Unknown table 'session' in SELECT
 SELECT keep_files_on_create = @@session.keep_files_on_create;
-ERROR 42S22: Unknown column 'keep_files_on_create' in 'field list'
+ERROR 42S22: Unknown column 'keep_files_on_create' in 'SELECT'
 SET @@global.keep_files_on_create = @start_global_value;
 SELECT @@global.keep_files_on_create;
 @@global.keep_files_on_create
diff --git a/mysql-test/suite/sys_vars/r/key_buffer_size_basic.result b/mysql-test/suite/sys_vars/r/key_buffer_size_basic.result
index 084e342dc2d..a2a18e1bcc6 100644
--- a/mysql-test/suite/sys_vars/r/key_buffer_size_basic.result
+++ b/mysql-test/suite/sys_vars/r/key_buffer_size_basic.result
@@ -63,9 +63,9 @@ SELECT @@key_buffer_size = @@global.key_buffer_size;
 SET key_buffer_size = 8 ;
 ERROR HY000: Variable 'key_buffer_size' is a GLOBAL variable and should be set with SET GLOBAL
 SELECT local.key_buffer_size;
-ERROR 42S02: Unknown table 'local' in field list
+ERROR 42S02: Unknown table 'local' in SELECT
 SELECT global.key_buffer_size;
-ERROR 42S02: Unknown table 'global' in field list
+ERROR 42S02: Unknown table 'global' in SELECT
 SELECT key_buffer_size = @@session.key_buffer_size;
-ERROR 42S22: Unknown column 'key_buffer_size' in 'field list'
+ERROR 42S22: Unknown column 'key_buffer_size' in 'SELECT'
 SET @@global.key_buffer_size = @start_value;
diff --git a/mysql-test/suite/sys_vars/r/key_cache_age_threshold_basic.result b/mysql-test/suite/sys_vars/r/key_cache_age_threshold_basic.result
index df339d7e3ab..01238222802 100644
--- a/mysql-test/suite/sys_vars/r/key_cache_age_threshold_basic.result
+++ b/mysql-test/suite/sys_vars/r/key_cache_age_threshold_basic.result
@@ -116,11 +116,11 @@ SELECT @@key_cache_age_threshold;
 @@key_cache_age_threshold
 100
 SELECT local.key_cache_age_threshold;
-ERROR 42S02: Unknown table 'local' in field list
+ERROR 42S02: Unknown table 'local' in SELECT
 SELECT global.key_cache_age_threshold;
-ERROR 42S02: Unknown table 'global' in field list
+ERROR 42S02: Unknown table 'global' in SELECT
 SELECT key_cache_age_threshold = @@session.key_cache_age_threshold;
-ERROR 42S22: Unknown column 'key_cache_age_threshold' in 'field list'
+ERROR 42S22: Unknown column 'key_cache_age_threshold' in 'SELECT'
 SET @@global.key_cache_age_threshold = @start_value;
 SELECT @@global.key_cache_age_threshold;
 @@global.key_cache_age_threshold
diff --git a/mysql-test/suite/sys_vars/r/key_cache_block_size_basic.result b/mysql-test/suite/sys_vars/r/key_cache_block_size_basic.result
index 7271a307b7b..53a7a273287 100644
--- a/mysql-test/suite/sys_vars/r/key_cache_block_size_basic.result
+++ b/mysql-test/suite/sys_vars/r/key_cache_block_size_basic.result
@@ -126,11 +126,11 @@ SELECT @@key_cache_block_size;
 @@key_cache_block_size
 1024
 SELECT local.key_cache_block_size;
-ERROR 42S02: Unknown table 'local' in field list
+ERROR 42S02: Unknown table 'local' in SELECT
 SELECT global.key_cache_block_size;
-ERROR 42S02: Unknown table 'global' in field list
+ERROR 42S02: Unknown table 'global' in SELECT
 SELECT key_cache_block_size = @@session.key_cache_block_size;
-ERROR 42S22: Unknown column 'key_cache_block_size' in 'field list'
+ERROR 42S22: Unknown column 'key_cache_block_size' in 'SELECT'
 SET @@global.key_cache_block_size = @start_value;
 SELECT @@global.key_cache_block_size;
 @@global.key_cache_block_size
diff --git a/mysql-test/suite/sys_vars/r/key_cache_division_limit_basic.result b/mysql-test/suite/sys_vars/r/key_cache_division_limit_basic.result
index df17e92f702..2b8ddce2d9a 100644
--- a/mysql-test/suite/sys_vars/r/key_cache_division_limit_basic.result
+++ b/mysql-test/suite/sys_vars/r/key_cache_division_limit_basic.result
@@ -120,11 +120,11 @@ SELECT @@key_cache_division_limit;
 @@key_cache_division_limit
 90
 SELECT local.key_cache_division_limit;
-ERROR 42S02: Unknown table 'local' in field list
+ERROR 42S02: Unknown table 'local' in SELECT
 SELECT global.key_cache_division_limit;
-ERROR 42S02: Unknown table 'global' in field list
+ERROR 42S02: Unknown table 'global' in SELECT
 SELECT key_cache_division_limit = @@session.key_cache_division_limit;
-ERROR 42S22: Unknown column 'key_cache_division_limit' in 'field list'
+ERROR 42S22: Unknown column 'key_cache_division_limit' in 'SELECT'
 SET @@global.key_cache_division_limit = @start_value;
 SELECT @@global.key_cache_division_limit;
 @@global.key_cache_division_limit
diff --git a/mysql-test/suite/sys_vars/r/key_cache_file_hash_size_basic.result b/mysql-test/suite/sys_vars/r/key_cache_file_hash_size_basic.result
index 6ee871f791e..a76cecce66a 100644
--- a/mysql-test/suite/sys_vars/r/key_cache_file_hash_size_basic.result
+++ b/mysql-test/suite/sys_vars/r/key_cache_file_hash_size_basic.result
@@ -99,11 +99,11 @@ SELECT @@key_cache_file_hash_size;
 @@key_cache_file_hash_size
 150
 SELECT local.key_cache_file_hash_size;
-ERROR 42S02: Unknown table 'local' in field list
+ERROR 42S02: Unknown table 'local' in SELECT
 SELECT global.key_cache_file_hash_size;
-ERROR 42S02: Unknown table 'global' in field list
+ERROR 42S02: Unknown table 'global' in SELECT
 SELECT key_cache_file_hash_size = @@session.key_cache_file_hash_size;
-ERROR 42S22: Unknown column 'key_cache_file_hash_size' in 'field list'
+ERROR 42S22: Unknown column 'key_cache_file_hash_size' in 'SELECT'
 SET @@global.key_cache_file_hash_size = @start_value;
 SELECT @@global.key_cache_file_hash_size;
 @@global.key_cache_file_hash_size
diff --git a/mysql-test/suite/sys_vars/r/lc_time_names_basic.result b/mysql-test/suite/sys_vars/r/lc_time_names_basic.result
index 7d98f44f27b..445c1875b26 100644
--- a/mysql-test/suite/sys_vars/r/lc_time_names_basic.result
+++ b/mysql-test/suite/sys_vars/r/lc_time_names_basic.result
@@ -16,17 +16,17 @@ SELECT @session_start_value;
 en_US
 '#--------------------FN_DYNVARS_060_01------------------#'
 SELECT lc_time_names;
-ERROR 42S22: Unknown column 'lc_time_names' in 'field list'
+ERROR 42S22: Unknown column 'lc_time_names' in 'SELECT'
 SET lc_time_names=ar_AE;
 SELECT @@session.lc_time_names;
 @@session.lc_time_names
 ar_AE
 SET session lc_time_names=ar_AE;
 SELECT session lc_time_names;
-ERROR 42S22: Unknown column 'session' in 'field list'
+ERROR 42S22: Unknown column 'session' in 'SELECT'
 SET global lc_time_names=ar_AE;
 SELECT global lc_time_names;
-ERROR 42S22: Unknown column 'global' in 'field list'
+ERROR 42S22: Unknown column 'global' in 'SELECT'
 '#--------------------FN_DYNVARS_060_02-------------------------#'
 SET @@lc_time_names = en_ZA;
 SET @@lc_time_names = DEFAULT;
@@ -69,7 +69,7 @@ res
 1
 '#--------------------FN_DYNVARS_060_05-------------------------#'
 SET @@lc_time_names = en_US | en_GB ;
-ERROR 42S22: Unknown column 'en_US' in 'field list'
+ERROR 42S22: Unknown column 'en_US' in 'SET'
 '#--------------------FN_DYNVARS_060_06-------------------------#'
 SET @@session.lc_time_names=ar_AE;
 SELECT @@session.lc_time_names;
diff --git a/mysql-test/suite/sys_vars/r/license_basic.result b/mysql-test/suite/sys_vars/r/license_basic.result
index 1f92e595020..5f1c3d4cc92 100644
--- a/mysql-test/suite/sys_vars/r/license_basic.result
+++ b/mysql-test/suite/sys_vars/r/license_basic.result
@@ -49,5 +49,5 @@ COUNT(@@GLOBAL.license)
 1
 1 Expected
 SELECT license = @@SESSION.license;
-ERROR 42S22: Unknown column 'license' in 'field list'
+ERROR 42S22: Unknown column 'license' in 'SELECT'
 Expected error 'Readonly variable'
diff --git a/mysql-test/suite/sys_vars/r/local_infile_basic.result b/mysql-test/suite/sys_vars/r/local_infile_basic.result
index 81a7a39ef21..182f6078e13 100644
--- a/mysql-test/suite/sys_vars/r/local_infile_basic.result
+++ b/mysql-test/suite/sys_vars/r/local_infile_basic.result
@@ -88,9 +88,9 @@ SELECT @@local_infile;
 @@local_infile
 1
 SELECT global.local_infile;
-ERROR 42S02: Unknown table 'global' in field list
+ERROR 42S02: Unknown table 'global' in SELECT
 SELECT local_infile = @@session.local_infile;
-ERROR 42S22: Unknown column 'local_infile' in 'field list'
+ERROR 42S22: Unknown column 'local_infile' in 'SELECT'
 SET @@global.local_infile = @start_value;
 SELECT @@global.local_infile;
 @@global.local_infile
diff --git a/mysql-test/suite/sys_vars/r/lock_wait_timeout_basic.result b/mysql-test/suite/sys_vars/r/lock_wait_timeout_basic.result
index f5d66b7c561..a46cc3eb8b7 100644
--- a/mysql-test/suite/sys_vars/r/lock_wait_timeout_basic.result
+++ b/mysql-test/suite/sys_vars/r/lock_wait_timeout_basic.result
@@ -156,11 +156,11 @@ SELECT @@lock_wait_timeout;
 @@lock_wait_timeout
 1
 SELECT local.lock_wait_timeout;
-ERROR 42S02: Unknown table 'local' in field list
+ERROR 42S02: Unknown table 'local' in SELECT
 SELECT session.lock_wait_timeout;
-ERROR 42S02: Unknown table 'session' in field list
+ERROR 42S02: Unknown table 'session' in SELECT
 SELECT lock_wait_timeout = @@session.lock_wait_timeout;
-ERROR 42S22: Unknown column 'lock_wait_timeout' in 'field list'
+ERROR 42S22: Unknown column 'lock_wait_timeout' in 'SELECT'
 SET @@global.lock_wait_timeout = @start_global_value;
 SELECT @@global.lock_wait_timeout;
 @@global.lock_wait_timeout
diff --git a/mysql-test/suite/sys_vars/r/log_bin_trust_function_creators_basic.result b/mysql-test/suite/sys_vars/r/log_bin_trust_function_creators_basic.result
index 411bf5a77e4..56ce8204253 100644
--- a/mysql-test/suite/sys_vars/r/log_bin_trust_function_creators_basic.result
+++ b/mysql-test/suite/sys_vars/r/log_bin_trust_function_creators_basic.result
@@ -85,11 +85,11 @@ SELECT @@log_bin_trust_function_creators;
 @@log_bin_trust_function_creators
 1
 SELECT local.log_bin_trust_function_creators;
-ERROR 42S02: Unknown table 'local' in field list
+ERROR 42S02: Unknown table 'local' in SELECT
 SELECT session.log_bin_trust_function_creators;
-ERROR 42S02: Unknown table 'session' in field list
+ERROR 42S02: Unknown table 'session' in SELECT
 SELECT log_bin_trust_function_creators = @@session.log_bin_trust_function_creators;
-ERROR 42S22: Unknown column 'log_bin_trust_function_creators' in 'field list'
+ERROR 42S22: Unknown column 'log_bin_trust_function_creators' in 'SELECT'
 SET @@global.log_bin_trust_function_creators = @start_global_value;
 SELECT @@global.log_bin_trust_function_creators;
 @@global.log_bin_trust_function_creators
diff --git a/mysql-test/suite/sys_vars/r/log_slow_queries_basic.result b/mysql-test/suite/sys_vars/r/log_slow_queries_basic.result
deleted file mode 100644
index 2c47106ecb3..00000000000
--- a/mysql-test/suite/sys_vars/r/log_slow_queries_basic.result
+++ /dev/null
@@ -1,132 +0,0 @@
-SET @start_value = @@global.log_slow_queries;
-SELECT @start_value;
-@start_value
-1
-'#---------------------FN_DYNVARS_004_01-------------------------#'
-SET @@global.log_slow_queries = DEFAULT;
-Warnings:
-Warning	1287	'@@log_slow_queries' is deprecated and will be removed in a future release. Please use '@@slow_query_log' instead
-SELECT @@global.log_slow_queries = 0;
-@@global.log_slow_queries = 0
-1
-'#--------------------FN_DYNVARS_004_02------------------------#'
-SET @@global.log_slow_queries = ON;
-Warnings:
-Warning	1287	'@@log_slow_queries' is deprecated and will be removed in a future release. Please use '@@slow_query_log' instead
-SELECT @@global.log_slow_queries;
-@@global.log_slow_queries
-1
-SET @@global.log_slow_queries = OFF;
-Warnings:
-Warning	1287	'@@log_slow_queries' is deprecated and will be removed in a future release. Please use '@@slow_query_log' instead
-SELECT @@global.log_slow_queries;
-@@global.log_slow_queries
-0
-'#--------------------FN_DYNVARS_004_03-------------------------#'
-SET @@global.log_slow_queries = 2;
-ERROR 42000: Variable 'log_slow_queries' can't be set to the value of '2'
-SET @@global.log_slow_queries = -1;
-ERROR 42000: Variable 'log_slow_queries' can't be set to the value of '-1'
-SET @@global.log_slow_queries = TRUEF;
-ERROR 42000: Variable 'log_slow_queries' can't be set to the value of 'TRUEF'
-SET @@global.log_slow_queries = TRUE_F;
-ERROR 42000: Variable 'log_slow_queries' can't be set to the value of 'TRUE_F'
-SET @@global.log_slow_queries = FALSE0;
-ERROR 42000: Variable 'log_slow_queries' can't be set to the value of 'FALSE0'
-SET @@global.log_slow_queries = OON;
-ERROR 42000: Variable 'log_slow_queries' can't be set to the value of 'OON'
-SET @@global.log_slow_queries = ONN;
-ERROR 42000: Variable 'log_slow_queries' can't be set to the value of 'ONN'
-SET @@global.log_slow_queries = OOFF;
-ERROR 42000: Variable 'log_slow_queries' can't be set to the value of 'OOFF'
-SET @@global.log_slow_queries = 0FF;
-ERROR 42000: Variable 'log_slow_queries' can't be set to the value of '0FF'
-SET @@global.log_slow_queries = ' ';
-ERROR 42000: Variable 'log_slow_queries' can't be set to the value of ' '
-SET @@global.log_slow_queries = " ";
-ERROR 42000: Variable 'log_slow_queries' can't be set to the value of ' '
-SET @@global.log_slow_queries = '';
-ERROR 42000: Variable 'log_slow_queries' can't be set to the value of ''
-'#-------------------FN_DYNVARS_004_04----------------------------#'
-SET @@session.log_slow_queries = OFF;
-ERROR HY000: Variable 'log_slow_queries' is a GLOBAL variable and should be set with SET GLOBAL
-SELECT @@session.log_slow_queries;
-ERROR HY000: Variable 'log_slow_queries' is a GLOBAL variable
-'#----------------------FN_DYNVARS_004_05------------------------#'
-SELECT IF(@@global.log_slow_queries, "ON", "OFF") = VARIABLE_VALUE 
-FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES 
-WHERE VARIABLE_NAME='log_slow_queries';
-IF(@@global.log_slow_queries, "ON", "OFF") = VARIABLE_VALUE
-1
-'#---------------------FN_DYNVARS_004_06----------------------#'
-SET @@global.log_slow_queries = 0;
-Warnings:
-Warning	1287	'@@log_slow_queries' is deprecated and will be removed in a future release. Please use '@@slow_query_log' instead
-SELECT @@global.log_slow_queries;
-@@global.log_slow_queries
-0
-SELECT IF(@@global.log_slow_queries, "ON", "OFF") = VARIABLE_VALUE 
-FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES 
-WHERE VARIABLE_NAME='log_slow_queries';
-IF(@@global.log_slow_queries, "ON", "OFF") = VARIABLE_VALUE
-1
-SET @@global.log_slow_queries = 1;
-Warnings:
-Warning	1287	'@@log_slow_queries' is deprecated and will be removed in a future release. Please use '@@slow_query_log' instead
-SELECT @@global.log_slow_queries;
-@@global.log_slow_queries
-1
-SELECT IF(@@global.log_slow_queries, "ON", "OFF") = VARIABLE_VALUE 
-FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES 
-WHERE VARIABLE_NAME='log_slow_queries';
-IF(@@global.log_slow_queries, "ON", "OFF") = VARIABLE_VALUE
-1
-'#---------------------FN_DYNVARS_004_07----------------------#'
-SET @@global.log_slow_queries = TRUE;
-Warnings:
-Warning	1287	'@@log_slow_queries' is deprecated and will be removed in a future release. Please use '@@slow_query_log' instead
-SELECT @@global.log_slow_queries;
-@@global.log_slow_queries
-1
-SELECT IF(@@global.log_slow_queries, "ON", "OFF") = VARIABLE_VALUE 
-FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES 
-WHERE VARIABLE_NAME='log_slow_queries';
-IF(@@global.log_slow_queries, "ON", "OFF") = VARIABLE_VALUE
-1
-SET @@global.log_slow_queries = FALSE;
-Warnings:
-Warning	1287	'@@log_slow_queries' is deprecated and will be removed in a future release. Please use '@@slow_query_log' instead
-SELECT @@global.log_slow_queries;
-@@global.log_slow_queries
-0
-SELECT IF(@@global.log_slow_queries, "ON", "OFF") = VARIABLE_VALUE 
-FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES 
-WHERE VARIABLE_NAME='log_slow_queries';
-IF(@@global.log_slow_queries, "ON", "OFF") = VARIABLE_VALUE
-1
-'#---------------------FN_DYNVARS_004_08----------------------#'
-SET @@global.log_slow_queries = ON;
-Warnings:
-Warning	1287	'@@log_slow_queries' is deprecated and will be removed in a future release. Please use '@@slow_query_log' instead
-SELECT @@log_slow_queries = @@global.log_slow_queries;
-@@log_slow_queries = @@global.log_slow_queries
-1
-'#---------------------FN_DYNVARS_004_09----------------------#'
-SET log_slow_queries = ON;
-ERROR HY000: Variable 'log_slow_queries' is a GLOBAL variable and should be set with SET GLOBAL
-SET local.log_slow_queries = OFF;
-ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'log_slow_queries = OFF' at line 1
-SELECT local.log_slow_queries;
-ERROR 42S02: Unknown table 'local' in field list
-SET global.log_slow_queries = ON;
-ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'log_slow_queries = ON' at line 1
-SELECT global.log_slow_queries;
-ERROR 42S02: Unknown table 'global' in field list
-SELECT log_slow_queries = @@session.log_slow_queries;
-ERROR 42S22: Unknown column 'log_slow_queries' in 'field list'
-SET @@global.log_slow_queries = @start_value;
-Warnings:
-Warning	1287	'@@log_slow_queries' is deprecated and will be removed in a future release. Please use '@@slow_query_log' instead
-SELECT @@global.log_slow_queries;
-@@global.log_slow_queries
-1
diff --git a/mysql-test/suite/sys_vars/r/log_warnings_basic.result b/mysql-test/suite/sys_vars/r/log_warnings_basic.result
index eac8949f7c6..75bbc98ce4e 100644
--- a/mysql-test/suite/sys_vars/r/log_warnings_basic.result
+++ b/mysql-test/suite/sys_vars/r/log_warnings_basic.result
@@ -150,11 +150,11 @@ SELECT @@log_warnings;
 @@log_warnings
 1
 SELECT local.log_warnings;
-ERROR 42S02: Unknown table 'local' in field list
+ERROR 42S02: Unknown table 'local' in SELECT
 SELECT session.log_warnings;
-ERROR 42S02: Unknown table 'session' in field list
+ERROR 42S02: Unknown table 'session' in SELECT
 SELECT log_warnings = @@session.log_warnings;
-ERROR 42S22: Unknown column 'log_warnings' in 'field list'
+ERROR 42S22: Unknown column 'log_warnings' in 'SELECT'
 SET @@global.log_warnings = @start_global_value;
 SELECT @@global.log_warnings;
 @@global.log_warnings
diff --git a/mysql-test/suite/sys_vars/r/long_query_time_basic.result b/mysql-test/suite/sys_vars/r/long_query_time_basic.result
index 198030e7564..342bfc9748b 100644
--- a/mysql-test/suite/sys_vars/r/long_query_time_basic.result
+++ b/mysql-test/suite/sys_vars/r/long_query_time_basic.result
@@ -136,9 +136,9 @@ SELECT @@long_query_time;
 @@long_query_time
 1.000000
 SELECT local.long_query_time;
-ERROR 42S02: Unknown table 'local' in field list
+ERROR 42S02: Unknown table 'local' in SELECT
 SELECT session.long_query_time;
-ERROR 42S02: Unknown table 'session' in field list
+ERROR 42S02: Unknown table 'session' in SELECT
 SELECT long_query_time = @@session.long_query_time;
-ERROR 42S22: Unknown column 'long_query_time' in 'field list'
+ERROR 42S22: Unknown column 'long_query_time' in 'SELECT'
 SET @@global.long_query_time = @start_global_value;
diff --git a/mysql-test/suite/sys_vars/r/low_priority_updates_basic.result b/mysql-test/suite/sys_vars/r/low_priority_updates_basic.result
index 53381db3148..127b583fd51 100644
--- a/mysql-test/suite/sys_vars/r/low_priority_updates_basic.result
+++ b/mysql-test/suite/sys_vars/r/low_priority_updates_basic.result
@@ -145,11 +145,11 @@ SELECT @@low_priority_updates;
 @@low_priority_updates
 1
 SELECT local.low_priority_updates;
-ERROR 42S02: Unknown table 'local' in field list
+ERROR 42S02: Unknown table 'local' in SELECT
 SELECT session.low_priority_updates;
-ERROR 42S02: Unknown table 'session' in field list
+ERROR 42S02: Unknown table 'session' in SELECT
 SELECT low_priority_updates = @@session.low_priority_updates;
-ERROR 42S22: Unknown column 'low_priority_updates' in 'field list'
+ERROR 42S22: Unknown column 'low_priority_updates' in 'SELECT'
 SET @@global.low_priority_updates = @start_global_value;
 SELECT @@global.low_priority_updates;
 @@global.low_priority_updates
diff --git a/mysql-test/suite/sys_vars/r/max_allowed_packet_basic.result b/mysql-test/suite/sys_vars/r/max_allowed_packet_basic.result
index 32b8f73491e..51b6e6c7c57 100644
--- a/mysql-test/suite/sys_vars/r/max_allowed_packet_basic.result
+++ b/mysql-test/suite/sys_vars/r/max_allowed_packet_basic.result
@@ -187,10 +187,10 @@ SELECT @@max_allowed_packet;
 @@max_allowed_packet
 16777216
 SELECT local.max_allowed_packet;
-ERROR 42S02: Unknown table 'local' in field list
+ERROR 42S02: Unknown table 'local' in SELECT
 SELECT session.max_allowed_packet;
-ERROR 42S02: Unknown table 'session' in field list
+ERROR 42S02: Unknown table 'session' in SELECT
 SELECT max_allowed_packet = @@session.max_allowed_packet;
-ERROR 42S22: Unknown column 'max_allowed_packet' in 'field list'
+ERROR 42S22: Unknown column 'max_allowed_packet' in 'SELECT'
 connection default;
 SET @@global.max_allowed_packet = @start_global_value;
diff --git a/mysql-test/suite/sys_vars/r/max_binlog_cache_size_basic.result b/mysql-test/suite/sys_vars/r/max_binlog_cache_size_basic.result
index e84c2aa40dd..892472ece55 100644
--- a/mysql-test/suite/sys_vars/r/max_binlog_cache_size_basic.result
+++ b/mysql-test/suite/sys_vars/r/max_binlog_cache_size_basic.result
@@ -138,11 +138,11 @@ SELECT @@max_binlog_cache_size;
 @@max_binlog_cache_size
 4096
 SELECT local.max_binlog_cache_size;
-ERROR 42S02: Unknown table 'local' in field list
+ERROR 42S02: Unknown table 'local' in SELECT
 SELECT global.max_binlog_cache_size;
-ERROR 42S02: Unknown table 'global' in field list
+ERROR 42S02: Unknown table 'global' in SELECT
 SELECT max_binlog_cache_size = @@session.max_binlog_cache_size;
-ERROR 42S22: Unknown column 'max_binlog_cache_size' in 'field list'
+ERROR 42S22: Unknown column 'max_binlog_cache_size' in 'SELECT'
 SET @@global.max_binlog_cache_size = @start_value;
 SELECT @@global.max_binlog_cache_size;
 @@global.max_binlog_cache_size
diff --git a/mysql-test/suite/sys_vars/r/max_binlog_size_basic.result b/mysql-test/suite/sys_vars/r/max_binlog_size_basic.result
index 4a1e3beda67..2b4ad785485 100644
--- a/mysql-test/suite/sys_vars/r/max_binlog_size_basic.result
+++ b/mysql-test/suite/sys_vars/r/max_binlog_size_basic.result
@@ -137,11 +137,11 @@ SELECT @@max_binlog_size;
 @@max_binlog_size
 4096
 SELECT local.max_binlog_size;
-ERROR 42S02: Unknown table 'local' in field list
+ERROR 42S02: Unknown table 'local' in SELECT
 SELECT global.max_binlog_size;
-ERROR 42S02: Unknown table 'global' in field list
+ERROR 42S02: Unknown table 'global' in SELECT
 SELECT max_binlog_size = @@session.max_binlog_size;
-ERROR 42S22: Unknown column 'max_binlog_size' in 'field list'
+ERROR 42S22: Unknown column 'max_binlog_size' in 'SELECT'
 SET @@global.max_binlog_size = @start_value;
 SELECT @@global.max_binlog_size;
 @@global.max_binlog_size
diff --git a/mysql-test/suite/sys_vars/r/max_binlog_stmt_cache_size_basic.result b/mysql-test/suite/sys_vars/r/max_binlog_stmt_cache_size_basic.result
index 5f4c5e3fd71..957d85e2b7d 100644
--- a/mysql-test/suite/sys_vars/r/max_binlog_stmt_cache_size_basic.result
+++ b/mysql-test/suite/sys_vars/r/max_binlog_stmt_cache_size_basic.result
@@ -138,11 +138,11 @@ SELECT @@max_binlog_stmt_cache_size;
 @@max_binlog_stmt_cache_size
 4096
 SELECT local.max_binlog_stmt_cache_size;
-ERROR 42S02: Unknown table 'local' in field list
+ERROR 42S02: Unknown table 'local' in SELECT
 SELECT global.max_binlog_stmt_cache_size;
-ERROR 42S02: Unknown table 'global' in field list
+ERROR 42S02: Unknown table 'global' in SELECT
 SELECT max_binlog_stmt_cache_size = @@session.max_binlog_stmt_cache_size;
-ERROR 42S22: Unknown column 'max_binlog_stmt_cache_size' in 'field list'
+ERROR 42S22: Unknown column 'max_binlog_stmt_cache_size' in 'SELECT'
 SET @@global.max_binlog_stmt_cache_size = @start_value;
 SELECT @@global.max_binlog_stmt_cache_size;
 @@global.max_binlog_stmt_cache_size
diff --git a/mysql-test/suite/sys_vars/r/max_connect_errors_basic.result b/mysql-test/suite/sys_vars/r/max_connect_errors_basic.result
index e37463fa465..977c24d9b27 100644
--- a/mysql-test/suite/sys_vars/r/max_connect_errors_basic.result
+++ b/mysql-test/suite/sys_vars/r/max_connect_errors_basic.result
@@ -116,9 +116,9 @@ SELECT @@max_connect_errors;
 @@max_connect_errors
 5000
 SELECT local.max_connect_errors;
-ERROR 42S02: Unknown table 'local' in field list
+ERROR 42S02: Unknown table 'local' in SELECT
 SELECT global.max_connect_errors;
-ERROR 42S02: Unknown table 'global' in field list
+ERROR 42S02: Unknown table 'global' in SELECT
 SELECT max_connect_errors = @@session.max_connect_errors;
-ERROR 42S22: Unknown column 'max_connect_errors' in 'field list'
+ERROR 42S22: Unknown column 'max_connect_errors' in 'SELECT'
 SET @@global.max_connect_errors = @start_value;
diff --git a/mysql-test/suite/sys_vars/r/max_connections_basic.result b/mysql-test/suite/sys_vars/r/max_connections_basic.result
index 048fb99b3f5..a69408929df 100644
--- a/mysql-test/suite/sys_vars/r/max_connections_basic.result
+++ b/mysql-test/suite/sys_vars/r/max_connections_basic.result
@@ -125,9 +125,9 @@ SELECT @@max_connections;
 @@max_connections
 5000
 SELECT local.max_connections;
-ERROR 42S02: Unknown table 'local' in field list
+ERROR 42S02: Unknown table 'local' in SELECT
 SELECT global.max_connections;
-ERROR 42S02: Unknown table 'global' in field list
+ERROR 42S02: Unknown table 'global' in SELECT
 SELECT max_connections = @@session.max_connections;
-ERROR 42S22: Unknown column 'max_connections' in 'field list'
+ERROR 42S22: Unknown column 'max_connections' in 'SELECT'
 SET @@global.max_connections = @start_value;
diff --git a/mysql-test/suite/sys_vars/r/max_delayed_threads_basic.result b/mysql-test/suite/sys_vars/r/max_delayed_threads_basic.result
index a78ac90107f..5ea3e8af441 100644
--- a/mysql-test/suite/sys_vars/r/max_delayed_threads_basic.result
+++ b/mysql-test/suite/sys_vars/r/max_delayed_threads_basic.result
@@ -174,11 +174,11 @@ SELECT @@max_delayed_threads;
 @@max_delayed_threads
 16384
 SELECT local.max_delayed_threads;
-ERROR 42S02: Unknown table 'local' in field list
+ERROR 42S02: Unknown table 'local' in SELECT
 SELECT session.max_delayed_threads;
-ERROR 42S02: Unknown table 'session' in field list
+ERROR 42S02: Unknown table 'session' in SELECT
 SELECT max_delayed_threads = @@session.max_delayed_threads;
-ERROR 42S22: Unknown column 'max_delayed_threads' in 'field list'
+ERROR 42S22: Unknown column 'max_delayed_threads' in 'SELECT'
 SET @@global.max_delayed_threads = @start_global_value;
 SELECT @@global.max_delayed_threads;
 @@global.max_delayed_threads
diff --git a/mysql-test/suite/sys_vars/r/max_error_count_basic.result b/mysql-test/suite/sys_vars/r/max_error_count_basic.result
index 980789b09be..5bb56af7cc7 100644
--- a/mysql-test/suite/sys_vars/r/max_error_count_basic.result
+++ b/mysql-test/suite/sys_vars/r/max_error_count_basic.result
@@ -164,11 +164,11 @@ SELECT @@max_error_count;
 @@max_error_count
 1024
 SELECT local.max_error_count;
-ERROR 42S02: Unknown table 'local' in field list
+ERROR 42S02: Unknown table 'local' in SELECT
 SELECT session.max_error_count;
-ERROR 42S02: Unknown table 'session' in field list
+ERROR 42S02: Unknown table 'session' in SELECT
 SELECT max_error_count = @@session.max_error_count;
-ERROR 42S22: Unknown column 'max_error_count' in 'field list'
+ERROR 42S22: Unknown column 'max_error_count' in 'SELECT'
 SET @@global.max_error_count = @start_global_value;
 SELECT @@global.max_error_count;
 @@global.max_error_count
diff --git a/mysql-test/suite/sys_vars/r/max_heap_table_size_basic.result b/mysql-test/suite/sys_vars/r/max_heap_table_size_basic.result
index 1080e51cc62..484324aea28 100644
--- a/mysql-test/suite/sys_vars/r/max_heap_table_size_basic.result
+++ b/mysql-test/suite/sys_vars/r/max_heap_table_size_basic.result
@@ -192,9 +192,9 @@ SELECT @@max_heap_table_size;
 @@max_heap_table_size
 316776448
 SELECT local.max_heap_table_size;
-ERROR 42S02: Unknown table 'local' in field list
+ERROR 42S02: Unknown table 'local' in SELECT
 SELECT session.max_heap_table_size;
-ERROR 42S02: Unknown table 'session' in field list
+ERROR 42S02: Unknown table 'session' in SELECT
 SELECT max_heap_table_size = @@session.max_heap_table_size;
-ERROR 42S22: Unknown column 'max_heap_table_size' in 'field list'
+ERROR 42S22: Unknown column 'max_heap_table_size' in 'SELECT'
 SET @@global.max_heap_table_size = @start_global_value;
diff --git a/mysql-test/suite/sys_vars/r/max_insert_delayed_threads_basic.result b/mysql-test/suite/sys_vars/r/max_insert_delayed_threads_basic.result
index aa79a5a7b9d..7e74c3da5cb 100644
--- a/mysql-test/suite/sys_vars/r/max_insert_delayed_threads_basic.result
+++ b/mysql-test/suite/sys_vars/r/max_insert_delayed_threads_basic.result
@@ -174,11 +174,11 @@ SELECT @@max_insert_delayed_threads;
 @@max_insert_delayed_threads
 16384
 SELECT local.max_insert_delayed_threads;
-ERROR 42S02: Unknown table 'local' in field list
+ERROR 42S02: Unknown table 'local' in SELECT
 SELECT session.max_insert_delayed_threads;
-ERROR 42S02: Unknown table 'session' in field list
+ERROR 42S02: Unknown table 'session' in SELECT
 SELECT max_insert_delayed_threads = @@session.max_insert_delayed_threads;
-ERROR 42S22: Unknown column 'max_insert_delayed_threads' in 'field list'
+ERROR 42S22: Unknown column 'max_insert_delayed_threads' in 'SELECT'
 SET @@global.max_insert_delayed_threads = @start_global_value;
 SELECT @@global.max_insert_delayed_threads;
 @@global.max_insert_delayed_threads
diff --git a/mysql-test/suite/sys_vars/r/max_length_for_sort_data_basic.result b/mysql-test/suite/sys_vars/r/max_length_for_sort_data_basic.result
index 21d6f66f0bc..3a9136fe880 100644
--- a/mysql-test/suite/sys_vars/r/max_length_for_sort_data_basic.result
+++ b/mysql-test/suite/sys_vars/r/max_length_for_sort_data_basic.result
@@ -184,11 +184,11 @@ SELECT @@max_length_for_sort_data;
 @@max_length_for_sort_data
 1024
 SELECT local.max_length_for_sort_data;
-ERROR 42S02: Unknown table 'local' in field list
+ERROR 42S02: Unknown table 'local' in SELECT
 SELECT session.max_length_for_sort_data;
-ERROR 42S02: Unknown table 'session' in field list
+ERROR 42S02: Unknown table 'session' in SELECT
 SELECT max_length_for_sort_data = @@session.max_length_for_sort_data;
-ERROR 42S22: Unknown column 'max_length_for_sort_data' in 'field list'
+ERROR 42S22: Unknown column 'max_length_for_sort_data' in 'SELECT'
 SET @@global.max_length_for_sort_data = @start_global_value;
 SELECT @@global.max_length_for_sort_data;
 @@global.max_length_for_sort_data
diff --git a/mysql-test/suite/sys_vars/r/max_prepared_stmt_count_basic.result b/mysql-test/suite/sys_vars/r/max_prepared_stmt_count_basic.result
index 453f6953406..2d8dcd531d4 100644
--- a/mysql-test/suite/sys_vars/r/max_prepared_stmt_count_basic.result
+++ b/mysql-test/suite/sys_vars/r/max_prepared_stmt_count_basic.result
@@ -117,11 +117,11 @@ SELECT @@max_prepared_stmt_count;
 @@max_prepared_stmt_count
 5000
 SELECT local.max_prepared_stmt_count;
-ERROR 42S02: Unknown table 'local' in field list
+ERROR 42S02: Unknown table 'local' in SELECT
 SELECT global.max_prepared_stmt_count;
-ERROR 42S02: Unknown table 'global' in field list
+ERROR 42S02: Unknown table 'global' in SELECT
 SELECT max_prepared_stmt_count = @@session.max_prepared_stmt_count;
-ERROR 42S22: Unknown column 'max_prepared_stmt_count' in 'field list'
+ERROR 42S22: Unknown column 'max_prepared_stmt_count' in 'SELECT'
 SET @@global.max_prepared_stmt_count = @start_value;
 SELECT @@global.max_prepared_stmt_count;
 @@global.max_prepared_stmt_count
diff --git a/mysql-test/suite/sys_vars/r/max_relay_log_size_basic.result b/mysql-test/suite/sys_vars/r/max_relay_log_size_basic.result
index efa2e05c59b..269152b14e6 100644
--- a/mysql-test/suite/sys_vars/r/max_relay_log_size_basic.result
+++ b/mysql-test/suite/sys_vars/r/max_relay_log_size_basic.result
@@ -134,11 +134,11 @@ SELECT @@max_relay_log_size;
 @@max_relay_log_size
 4096
 SELECT local.max_relay_log_size;
-ERROR 42S02: Unknown table 'local' in field list
+ERROR 42S02: Unknown table 'local' in SELECT
 SELECT global.max_relay_log_size;
-ERROR 42S02: Unknown table 'global' in field list
+ERROR 42S02: Unknown table 'global' in SELECT
 SELECT max_relay_log_size = @@session.max_relay_log_size;
-ERROR 42S22: Unknown column 'max_relay_log_size' in 'field list'
+ERROR 42S22: Unknown column 'max_relay_log_size' in 'SELECT'
 SET @@global.max_relay_log_size = @start_value;
 SELECT @@global.max_relay_log_size;
 @@global.max_relay_log_size
diff --git a/mysql-test/suite/sys_vars/r/max_seeks_for_key_basic.result b/mysql-test/suite/sys_vars/r/max_seeks_for_key_basic.result
index 2973e7e1efd..663d2d1bdb0 100644
--- a/mysql-test/suite/sys_vars/r/max_seeks_for_key_basic.result
+++ b/mysql-test/suite/sys_vars/r/max_seeks_for_key_basic.result
@@ -164,11 +164,11 @@ SELECT @@max_seeks_for_key;
 @@max_seeks_for_key
 1
 SELECT local.max_seeks_for_key;
-ERROR 42S02: Unknown table 'local' in field list
+ERROR 42S02: Unknown table 'local' in SELECT
 SELECT session.max_seeks_for_key;
-ERROR 42S02: Unknown table 'session' in field list
+ERROR 42S02: Unknown table 'session' in SELECT
 SELECT max_seeks_for_key = @@session.max_seeks_for_key;
-ERROR 42S22: Unknown column 'max_seeks_for_key' in 'field list'
+ERROR 42S22: Unknown column 'max_seeks_for_key' in 'SELECT'
 SET @@global.max_seeks_for_key = @start_global_value;
 SELECT @@global.max_seeks_for_key;
 @@global.max_seeks_for_key
diff --git a/mysql-test/suite/sys_vars/r/max_sp_recursion_depth_basic.result b/mysql-test/suite/sys_vars/r/max_sp_recursion_depth_basic.result
index b3d4917fd75..0edccb42cd9 100644
--- a/mysql-test/suite/sys_vars/r/max_sp_recursion_depth_basic.result
+++ b/mysql-test/suite/sys_vars/r/max_sp_recursion_depth_basic.result
@@ -184,11 +184,11 @@ SELECT @@max_sp_recursion_depth;
 @@max_sp_recursion_depth
 102
 SELECT local.max_sp_recursion_depth;
-ERROR 42S02: Unknown table 'local' in field list
+ERROR 42S02: Unknown table 'local' in SELECT
 SELECT session.max_sp_recursion_depth;
-ERROR 42S02: Unknown table 'session' in field list
+ERROR 42S02: Unknown table 'session' in SELECT
 SELECT max_sp_recursion_depth = @@session.max_sp_recursion_depth;
-ERROR 42S22: Unknown column 'max_sp_recursion_depth' in 'field list'
+ERROR 42S22: Unknown column 'max_sp_recursion_depth' in 'SELECT'
 SET @@global.max_sp_recursion_depth = @start_global_value;
 SELECT @@global.max_sp_recursion_depth;
 @@global.max_sp_recursion_depth
diff --git a/mysql-test/suite/sys_vars/r/max_statement_time_basic.result b/mysql-test/suite/sys_vars/r/max_statement_time_basic.result
index 8b384ac6765..ff5c81fe39f 100644
--- a/mysql-test/suite/sys_vars/r/max_statement_time_basic.result
+++ b/mysql-test/suite/sys_vars/r/max_statement_time_basic.result
@@ -151,11 +151,11 @@ SELECT @@max_statement_time;
 @@max_statement_time
 1.000000
 SELECT local.max_statement_time;
-ERROR 42S02: Unknown table 'local' in field list
+ERROR 42S02: Unknown table 'local' in SELECT
 SELECT session.max_statement_time;
-ERROR 42S02: Unknown table 'session' in field list
+ERROR 42S02: Unknown table 'session' in SELECT
 SELECT max_statement_time = @@session.max_statement_time;
-ERROR 42S22: Unknown column 'max_statement_time' in 'field list'
+ERROR 42S22: Unknown column 'max_statement_time' in 'SELECT'
 #
 # Check that one can use max_statement_time as a field
 #
diff --git a/mysql-test/suite/sys_vars/r/max_tmp_tables_basic.result b/mysql-test/suite/sys_vars/r/max_tmp_tables_basic.result
index dd00d1a0a23..7ed2e959cf1 100644
--- a/mysql-test/suite/sys_vars/r/max_tmp_tables_basic.result
+++ b/mysql-test/suite/sys_vars/r/max_tmp_tables_basic.result
@@ -232,11 +232,11 @@ SELECT @@max_tmp_tables;
 @@max_tmp_tables
 102
 SELECT local.max_tmp_tables;
-ERROR 42S02: Unknown table 'local' in field list
+ERROR 42S02: Unknown table 'local' in SELECT
 SELECT session.max_tmp_tables;
-ERROR 42S02: Unknown table 'session' in field list
+ERROR 42S02: Unknown table 'session' in SELECT
 SELECT max_tmp_tables = @@session.max_tmp_tables;
-ERROR 42S22: Unknown column 'max_tmp_tables' in 'field list'
+ERROR 42S22: Unknown column 'max_tmp_tables' in 'SELECT'
 SET @@global.max_tmp_tables = @start_global_value;
 Warnings:
 Warning	1287	'@@max_tmp_tables' is deprecated and will be removed in a future release
diff --git a/mysql-test/suite/sys_vars/r/max_user_connections_basic.result b/mysql-test/suite/sys_vars/r/max_user_connections_basic.result
index c31498c1a66..a8c3fd988bd 100644
--- a/mysql-test/suite/sys_vars/r/max_user_connections_basic.result
+++ b/mysql-test/suite/sys_vars/r/max_user_connections_basic.result
@@ -104,11 +104,11 @@ SELECT @@max_user_connections;
 @@max_user_connections
 102
 SELECT local.max_user_connections;
-ERROR 42S02: Unknown table 'local' in field list
+ERROR 42S02: Unknown table 'local' in SELECT
 SELECT session.max_user_connections;
-ERROR 42S02: Unknown table 'session' in field list
+ERROR 42S02: Unknown table 'session' in SELECT
 SELECT max_user_connections = @@session.max_user_connections;
-ERROR 42S22: Unknown column 'max_user_connections' in 'field list'
+ERROR 42S22: Unknown column 'max_user_connections' in 'SELECT'
 SET @@global.max_user_connections = @start_global_value;
 SELECT @@global.max_user_connections;
 @@global.max_user_connections
diff --git a/mysql-test/suite/sys_vars/r/max_write_lock_count_basic.result b/mysql-test/suite/sys_vars/r/max_write_lock_count_basic.result
index 59d92d5cfe8..cf268e63c9e 100644
--- a/mysql-test/suite/sys_vars/r/max_write_lock_count_basic.result
+++ b/mysql-test/suite/sys_vars/r/max_write_lock_count_basic.result
@@ -97,11 +97,11 @@ SELECT @@max_write_lock_count;
 @@max_write_lock_count
 102
 SELECT local.max_write_lock_count;
-ERROR 42S02: Unknown table 'local' in field list
+ERROR 42S02: Unknown table 'local' in SELECT
 SELECT global.max_write_lock_count;
-ERROR 42S02: Unknown table 'global' in field list
+ERROR 42S02: Unknown table 'global' in SELECT
 SELECT max_write_lock_count = @@global.max_write_lock_count;
-ERROR 42S22: Unknown column 'max_write_lock_count' in 'field list'
+ERROR 42S22: Unknown column 'max_write_lock_count' in 'SELECT'
 SET @@global.max_write_lock_count = @start_global_value;
 SELECT @@global.max_write_lock_count;
 @@global.max_write_lock_count
diff --git a/mysql-test/suite/sys_vars/r/min_examined_row_limit_basic.result b/mysql-test/suite/sys_vars/r/min_examined_row_limit_basic.result
index b4b1b9ae402..26a16d78699 100644
--- a/mysql-test/suite/sys_vars/r/min_examined_row_limit_basic.result
+++ b/mysql-test/suite/sys_vars/r/min_examined_row_limit_basic.result
@@ -168,11 +168,11 @@ SELECT @@min_examined_row_limit;
 @@min_examined_row_limit
 1
 SELECT local.min_examined_row_limit;
-ERROR 42S02: Unknown table 'local' in field list
+ERROR 42S02: Unknown table 'local' in SELECT
 SELECT session.min_examined_row_limit;
-ERROR 42S02: Unknown table 'session' in field list
+ERROR 42S02: Unknown table 'session' in SELECT
 SELECT min_examined_row_limit = @@session.min_examined_row_limit;
-ERROR 42S22: Unknown column 'min_examined_row_limit' in 'field list'
+ERROR 42S22: Unknown column 'min_examined_row_limit' in 'SELECT'
 SET @@global.min_examined_row_limit = @start_global_value;
 SELECT @@global.min_examined_row_limit;
 @@global.min_examined_row_limit
diff --git a/mysql-test/suite/sys_vars/r/myisam_data_pointer_size_basic.result b/mysql-test/suite/sys_vars/r/myisam_data_pointer_size_basic.result
index be5731c83bd..75e1e1aabb6 100644
--- a/mysql-test/suite/sys_vars/r/myisam_data_pointer_size_basic.result
+++ b/mysql-test/suite/sys_vars/r/myisam_data_pointer_size_basic.result
@@ -115,7 +115,7 @@ SELECT @@myisam_data_pointer_size = @@global.myisam_data_pointer_size;
 SET myisam_data_pointer_size = 7;
 ERROR HY000: Variable 'myisam_data_pointer_size' is a GLOBAL variable and should be set with SET GLOBAL
 SELECT myisam_data_pointer_size;
-ERROR 42S22: Unknown column 'myisam_data_pointer_size' in 'field list'
+ERROR 42S22: Unknown column 'myisam_data_pointer_size' in 'SELECT'
 SELECT @@myisam_data_pointer_size;
 @@myisam_data_pointer_size
 5
diff --git a/mysql-test/suite/sys_vars/r/myisam_max_sort_file_size_basic.result b/mysql-test/suite/sys_vars/r/myisam_max_sort_file_size_basic.result
index ab4f136db6f..e2f89a61495 100644
--- a/mysql-test/suite/sys_vars/r/myisam_max_sort_file_size_basic.result
+++ b/mysql-test/suite/sys_vars/r/myisam_max_sort_file_size_basic.result
@@ -119,7 +119,7 @@ SELECT @@myisam_max_sort_file_size = @@global.myisam_max_sort_file_size;
 SET myisam_max_sort_file_size = 2048;
 ERROR HY000: Variable 'myisam_max_sort_file_size' is a GLOBAL variable and should be set with SET GLOBAL
 SELECT myisam_max_sort_file_size;
-ERROR 42S22: Unknown column 'myisam_max_sort_file_size' in 'field list'
+ERROR 42S22: Unknown column 'myisam_max_sort_file_size' in 'SELECT'
 SELECT @@myisam_max_sort_file_size;
 @@myisam_max_sort_file_size
 0
diff --git a/mysql-test/suite/sys_vars/r/myisam_repair_threads_basic.result b/mysql-test/suite/sys_vars/r/myisam_repair_threads_basic.result
index 8ed5277c682..3460b672112 100644
--- a/mysql-test/suite/sys_vars/r/myisam_repair_threads_basic.result
+++ b/mysql-test/suite/sys_vars/r/myisam_repair_threads_basic.result
@@ -163,11 +163,11 @@ SELECT @@myisam_repair_threads ;
 @@myisam_repair_threads
 1
 SELECT local.myisam_repair_threads ;
-ERROR 42S02: Unknown table 'local' in field list
+ERROR 42S02: Unknown table 'local' in SELECT
 SELECT session.myisam_repair_threads ;
-ERROR 42S02: Unknown table 'session' in field list
+ERROR 42S02: Unknown table 'session' in SELECT
 SELECT myisam_repair_threads  = @@session.myisam_repair_threads ;
-ERROR 42S22: Unknown column 'myisam_repair_threads' in 'field list'
+ERROR 42S22: Unknown column 'myisam_repair_threads' in 'SELECT'
 SET @@global.myisam_repair_threads  = @start_global_value;
 SELECT @@global.myisam_repair_threads ;
 @@global.myisam_repair_threads
diff --git a/mysql-test/suite/sys_vars/r/myisam_sort_buffer_size_basic.result b/mysql-test/suite/sys_vars/r/myisam_sort_buffer_size_basic.result
index 0acb7878a75..d07c70bf056 100644
--- a/mysql-test/suite/sys_vars/r/myisam_sort_buffer_size_basic.result
+++ b/mysql-test/suite/sys_vars/r/myisam_sort_buffer_size_basic.result
@@ -168,9 +168,9 @@ SELECT @@myisam_sort_buffer_size  ;
 @@myisam_sort_buffer_size
 4096
 SELECT local.myisam_sort_buffer_size  ;
-ERROR 42S02: Unknown table 'local' in field list
+ERROR 42S02: Unknown table 'local' in SELECT
 SELECT session.myisam_sort_buffer_size  ;
-ERROR 42S02: Unknown table 'session' in field list
+ERROR 42S02: Unknown table 'session' in SELECT
 SELECT myisam_sort_buffer_size   = @@session.myisam_sort_buffer_size  ;
-ERROR 42S22: Unknown column 'myisam_sort_buffer_size' in 'field list'
+ERROR 42S22: Unknown column 'myisam_sort_buffer_size' in 'SELECT'
 SET @@global.myisam_sort_buffer_size   = @start_global_value;
diff --git a/mysql-test/suite/sys_vars/r/myisam_use_mmap_basic.result b/mysql-test/suite/sys_vars/r/myisam_use_mmap_basic.result
index 4b0e4afa38e..f66818b9d6d 100644
--- a/mysql-test/suite/sys_vars/r/myisam_use_mmap_basic.result
+++ b/mysql-test/suite/sys_vars/r/myisam_use_mmap_basic.result
@@ -48,5 +48,5 @@ COUNT(@@GLOBAL.myisam_use_mmap)
 1
 1 Expected
 SELECT myisam_use_mmap = @@SESSION.myisam_use_mmap;
-ERROR 42S22: Unknown column 'myisam_use_mmap' in 'field list'
+ERROR 42S22: Unknown column 'myisam_use_mmap' in 'SELECT'
 Expected error 'Readonly variable'
diff --git a/mysql-test/suite/sys_vars/r/mysql56_temporal_format_basic.result b/mysql-test/suite/sys_vars/r/mysql56_temporal_format_basic.result
index 7181cba99a1..7585c13c5b0 100644
--- a/mysql-test/suite/sys_vars/r/mysql56_temporal_format_basic.result
+++ b/mysql-test/suite/sys_vars/r/mysql56_temporal_format_basic.result
@@ -84,9 +84,9 @@ SELECT @@mysql56_temporal_format = @@global.mysql56_temporal_format;
 SET mysql56_temporal_format = 1;
 ERROR HY000: Variable 'mysql56_temporal_format' is a GLOBAL variable and should be set with SET GLOBAL
 SELECT global.mysql56_temporal_format;
-ERROR 42S02: Unknown table 'global' in field list
+ERROR 42S02: Unknown table 'global' in SELECT
 SELECT mysql56_temporal_format = @@session.mysql56_temporal_format;
-ERROR 42S22: Unknown column 'mysql56_temporal_format' in 'field list'
+ERROR 42S22: Unknown column 'mysql56_temporal_format' in 'SELECT'
 SET @@global.mysql56_temporal_format = @start_value;
 SELECT @@global.mysql56_temporal_format;
 @@global.mysql56_temporal_format
diff --git a/mysql-test/suite/sys_vars/r/net_buffer_length_basic.result b/mysql-test/suite/sys_vars/r/net_buffer_length_basic.result
index 6315dce2cef..c719351c673 100644
--- a/mysql-test/suite/sys_vars/r/net_buffer_length_basic.result
+++ b/mysql-test/suite/sys_vars/r/net_buffer_length_basic.result
@@ -132,10 +132,10 @@ SELECT @@net_buffer_length;
 @@net_buffer_length
 16384
 SELECT local.net_buffer_length;
-ERROR 42S02: Unknown table 'local' in field list
+ERROR 42S02: Unknown table 'local' in SELECT
 SELECT session.net_buffer_length;
-ERROR 42S02: Unknown table 'session' in field list
+ERROR 42S02: Unknown table 'session' in SELECT
 SELECT net_buffer_length = @@session.net_buffer_length;
-ERROR 42S22: Unknown column 'net_buffer_length' in 'field list'
+ERROR 42S22: Unknown column 'net_buffer_length' in 'SELECT'
 connection default;
 SET @@global.net_buffer_length = @start_global_value;
diff --git a/mysql-test/suite/sys_vars/r/net_read_timeout_basic.result b/mysql-test/suite/sys_vars/r/net_read_timeout_basic.result
index 7d2826ffed1..88fb7a81457 100644
--- a/mysql-test/suite/sys_vars/r/net_read_timeout_basic.result
+++ b/mysql-test/suite/sys_vars/r/net_read_timeout_basic.result
@@ -148,11 +148,11 @@ SELECT @@net_read_timeout;
 @@net_read_timeout
 1
 SELECT local.net_read_timeout;
-ERROR 42S02: Unknown table 'local' in field list
+ERROR 42S02: Unknown table 'local' in SELECT
 SELECT session.net_read_timeout;
-ERROR 42S02: Unknown table 'session' in field list
+ERROR 42S02: Unknown table 'session' in SELECT
 SELECT net_read_timeout = @@session.net_read_timeout;
-ERROR 42S22: Unknown column 'net_read_timeout' in 'field list'
+ERROR 42S22: Unknown column 'net_read_timeout' in 'SELECT'
 SET @@global.net_read_timeout = @start_global_value;
 SELECT @@global.net_read_timeout;
 @@global.net_read_timeout
diff --git a/mysql-test/suite/sys_vars/r/net_retry_count_basic.result b/mysql-test/suite/sys_vars/r/net_retry_count_basic.result
index 46eb9d5e1c0..1669d20c484 100644
--- a/mysql-test/suite/sys_vars/r/net_retry_count_basic.result
+++ b/mysql-test/suite/sys_vars/r/net_retry_count_basic.result
@@ -176,11 +176,11 @@ SELECT @@net_retry_count;
 @@net_retry_count
 1
 SELECT local.net_retry_count;
-ERROR 42S02: Unknown table 'local' in field list
+ERROR 42S02: Unknown table 'local' in SELECT
 SELECT session.net_retry_count;
-ERROR 42S02: Unknown table 'session' in field list
+ERROR 42S02: Unknown table 'session' in SELECT
 SELECT net_retry_count = @@session.net_retry_count;
-ERROR 42S22: Unknown column 'net_retry_count' in 'field list'
+ERROR 42S22: Unknown column 'net_retry_count' in 'SELECT'
 SET @@global.net_retry_count = @start_global_value;
 SELECT @@global.net_retry_count;
 @@global.net_retry_count
diff --git a/mysql-test/suite/sys_vars/r/net_write_timeout_basic.result b/mysql-test/suite/sys_vars/r/net_write_timeout_basic.result
index 28ffad86ffc..9cc59ed3f38 100644
--- a/mysql-test/suite/sys_vars/r/net_write_timeout_basic.result
+++ b/mysql-test/suite/sys_vars/r/net_write_timeout_basic.result
@@ -144,11 +144,11 @@ SELECT @@net_write_timeout;
 @@net_write_timeout
 1
 SELECT local.net_write_timeout;
-ERROR 42S02: Unknown table 'local' in field list
+ERROR 42S02: Unknown table 'local' in SELECT
 SELECT session.net_write_timeout;
-ERROR 42S02: Unknown table 'session' in field list
+ERROR 42S02: Unknown table 'session' in SELECT
 SELECT net_write_timeout = @@session.net_write_timeout;
-ERROR 42S22: Unknown column 'net_write_timeout' in 'field list'
+ERROR 42S22: Unknown column 'net_write_timeout' in 'SELECT'
 SET @@global.net_write_timeout = @start_global_value;
 SELECT @@global.net_write_timeout;
 @@global.net_write_timeout
diff --git a/mysql-test/suite/sys_vars/r/old_passwords_basic.result b/mysql-test/suite/sys_vars/r/old_passwords_basic.result
index 26d0e79071b..2cb1dcd3697 100644
--- a/mysql-test/suite/sys_vars/r/old_passwords_basic.result
+++ b/mysql-test/suite/sys_vars/r/old_passwords_basic.result
@@ -141,11 +141,11 @@ SELECT @@old_passwords;
 @@old_passwords
 1
 SELECT local.old_passwords;
-ERROR 42S02: Unknown table 'local' in field list
+ERROR 42S02: Unknown table 'local' in SELECT
 SELECT session.old_passwords;
-ERROR 42S02: Unknown table 'session' in field list
+ERROR 42S02: Unknown table 'session' in SELECT
 SELECT old_passwords = @@session.old_passwords;
-ERROR 42S22: Unknown column 'old_passwords' in 'field list'
+ERROR 42S22: Unknown column 'old_passwords' in 'SELECT'
 SET @@global.old_passwords = @start_global_value;
 SELECT @@global.old_passwords;
 @@global.old_passwords
diff --git a/mysql-test/suite/sys_vars/r/optimizer_prune_level_basic.result b/mysql-test/suite/sys_vars/r/optimizer_prune_level_basic.result
index 99843f0b93f..0ebd8ed5757 100644
--- a/mysql-test/suite/sys_vars/r/optimizer_prune_level_basic.result
+++ b/mysql-test/suite/sys_vars/r/optimizer_prune_level_basic.result
@@ -156,11 +156,11 @@ SELECT @@optimizer_prune_level;
 @@optimizer_prune_level
 1
 SELECT local.optimizer_prune_level;
-ERROR 42S02: Unknown table 'local' in field list
+ERROR 42S02: Unknown table 'local' in SELECT
 SELECT session.optimizer_prune_level;
-ERROR 42S02: Unknown table 'session' in field list
+ERROR 42S02: Unknown table 'session' in SELECT
 SELECT optimizer_prune_level = @@session.optimizer_prune_level;
-ERROR 42S22: Unknown column 'optimizer_prune_level' in 'field list'
+ERROR 42S22: Unknown column 'optimizer_prune_level' in 'SELECT'
 SET @@global.optimizer_prune_level = @start_global_value;
 SELECT @@global.optimizer_prune_level;
 @@global.optimizer_prune_level
diff --git a/mysql-test/suite/sys_vars/r/optimizer_search_depth_basic.result b/mysql-test/suite/sys_vars/r/optimizer_search_depth_basic.result
index 75d99943288..4e0573d068a 100644
--- a/mysql-test/suite/sys_vars/r/optimizer_search_depth_basic.result
+++ b/mysql-test/suite/sys_vars/r/optimizer_search_depth_basic.result
@@ -162,11 +162,11 @@ SELECT @@optimizer_search_depth;
 @@optimizer_search_depth
 1
 SELECT local.optimizer_search_depth;
-ERROR 42S02: Unknown table 'local' in field list
+ERROR 42S02: Unknown table 'local' in SELECT
 SELECT session.optimizer_search_depth;
-ERROR 42S02: Unknown table 'session' in field list
+ERROR 42S02: Unknown table 'session' in SELECT
 SELECT optimizer_search_depth = @@session.optimizer_search_depth;
-ERROR 42S22: Unknown column 'optimizer_search_depth' in 'field list'
+ERROR 42S22: Unknown column 'optimizer_search_depth' in 'SELECT'
 SET @@global.optimizer_search_depth = @start_global_value;
 SELECT @@global.optimizer_search_depth;
 @@global.optimizer_search_depth
diff --git a/mysql-test/suite/sys_vars/r/preload_buffer_size_basic.result b/mysql-test/suite/sys_vars/r/preload_buffer_size_basic.result
index fef19db95c5..281f7bafa69 100644
--- a/mysql-test/suite/sys_vars/r/preload_buffer_size_basic.result
+++ b/mysql-test/suite/sys_vars/r/preload_buffer_size_basic.result
@@ -178,11 +178,11 @@ SELECT @@preload_buffer_size;
 @@preload_buffer_size
 1024
 SELECT local.preload_buffer_size;
-ERROR 42S02: Unknown table 'local' in field list
+ERROR 42S02: Unknown table 'local' in SELECT
 SELECT session.preload_buffer_size;
-ERROR 42S02: Unknown table 'session' in field list
+ERROR 42S02: Unknown table 'session' in SELECT
 SELECT preload_buffer_size = @@session.preload_buffer_size;
-ERROR 42S22: Unknown column 'preload_buffer_size' in 'field list'
+ERROR 42S22: Unknown column 'preload_buffer_size' in 'SELECT'
 SET @@global.preload_buffer_size = @start_global_value;
 SELECT @@global.preload_buffer_size;
 @@global.preload_buffer_size
diff --git a/mysql-test/suite/sys_vars/r/pseudo_slave_mode_basic.result b/mysql-test/suite/sys_vars/r/pseudo_slave_mode_basic.result
index c98dd338909..c80da24d2dc 100644
--- a/mysql-test/suite/sys_vars/r/pseudo_slave_mode_basic.result
+++ b/mysql-test/suite/sys_vars/r/pseudo_slave_mode_basic.result
@@ -25,9 +25,9 @@ SELECT @@pseudo_slave_mode;
 @@pseudo_slave_mode
 1
 SELECT session.pseudo_slave_mode;
-ERROR 42S02: Unknown table 'session' in field list
+ERROR 42S02: Unknown table 'session' in SELECT
 SELECT local.pseudo_slave_mode;
-ERROR 42S02: Unknown table 'local' in field list
+ERROR 42S02: Unknown table 'local' in SELECT
 SET session pseudo_slave_mode = 0;
 Warnings:
 Warning	1231	Slave applier execution mode not active, statement ineffective.
diff --git a/mysql-test/suite/sys_vars/r/query_alloc_block_size_basic.result b/mysql-test/suite/sys_vars/r/query_alloc_block_size_basic.result
index 0d7abae094b..accabb34dbe 100644
--- a/mysql-test/suite/sys_vars/r/query_alloc_block_size_basic.result
+++ b/mysql-test/suite/sys_vars/r/query_alloc_block_size_basic.result
@@ -169,11 +169,11 @@ SELECT @@query_alloc_block_size;
 @@query_alloc_block_size
 1024
 SELECT local.query_alloc_block_size;
-ERROR 42S02: Unknown table 'local' in field list
+ERROR 42S02: Unknown table 'local' in SELECT
 SELECT session.query_alloc_block_size;
-ERROR 42S02: Unknown table 'session' in field list
+ERROR 42S02: Unknown table 'session' in SELECT
 SELECT query_alloc_block_size = @@session.query_alloc_block_size;
-ERROR 42S22: Unknown column 'query_alloc_block_size' in 'field list'
+ERROR 42S22: Unknown column 'query_alloc_block_size' in 'SELECT'
 SET @@global.query_alloc_block_size = @start_global_value;
 SELECT @@global.query_alloc_block_size;
 @@global.query_alloc_block_size
diff --git a/mysql-test/suite/sys_vars/r/query_cache_limit_basic.result b/mysql-test/suite/sys_vars/r/query_cache_limit_basic.result
index ba70a76ae55..87b2b6a4d78 100644
--- a/mysql-test/suite/sys_vars/r/query_cache_limit_basic.result
+++ b/mysql-test/suite/sys_vars/r/query_cache_limit_basic.result
@@ -114,11 +114,11 @@ SELECT @@query_cache_limit;
 @@query_cache_limit
 1
 SELECT local.query_cache_limit;
-ERROR 42S02: Unknown table 'local' in field list
+ERROR 42S02: Unknown table 'local' in SELECT
 SELECT global.query_cache_limit;
-ERROR 42S02: Unknown table 'global' in field list
+ERROR 42S02: Unknown table 'global' in SELECT
 SELECT query_cache_limit = @@session.query_cache_limit;
-ERROR 42S22: Unknown column 'query_cache_limit' in 'field list'
+ERROR 42S22: Unknown column 'query_cache_limit' in 'SELECT'
 SET @@global.query_cache_limit = @start_value;
 SELECT @@global.query_cache_limit;
 @@global.query_cache_limit
diff --git a/mysql-test/suite/sys_vars/r/query_cache_min_res_unit_basic.result b/mysql-test/suite/sys_vars/r/query_cache_min_res_unit_basic.result
index a46476f0fdd..30b5bb23f98 100644
--- a/mysql-test/suite/sys_vars/r/query_cache_min_res_unit_basic.result
+++ b/mysql-test/suite/sys_vars/r/query_cache_min_res_unit_basic.result
@@ -134,11 +134,11 @@ SELECT @@query_cache_min_res_unit;
 @@query_cache_min_res_unit
 512
 SELECT local.query_cache_min_res_unit;
-ERROR 42S02: Unknown table 'local' in field list
+ERROR 42S02: Unknown table 'local' in SELECT
 SELECT global.query_cache_min_res_unit;
-ERROR 42S02: Unknown table 'global' in field list
+ERROR 42S02: Unknown table 'global' in SELECT
 SELECT query_cache_min_res_unit = @@session.query_cache_min_res_unit;
-ERROR 42S22: Unknown column 'query_cache_min_res_unit' in 'field list'
+ERROR 42S22: Unknown column 'query_cache_min_res_unit' in 'SELECT'
 SET @@global.query_cache_min_res_unit = @start_value;
 SELECT @@global.query_cache_min_res_unit;
 @@global.query_cache_min_res_unit
diff --git a/mysql-test/suite/sys_vars/r/query_cache_size_basic.result b/mysql-test/suite/sys_vars/r/query_cache_size_basic.result
index 5d4e0a54ad9..bdbb572f79c 100644
--- a/mysql-test/suite/sys_vars/r/query_cache_size_basic.result
+++ b/mysql-test/suite/sys_vars/r/query_cache_size_basic.result
@@ -121,9 +121,9 @@ SELECT @@query_cache_size;
 @@query_cache_size
 0
 SELECT local.query_cache_size;
-ERROR 42S02: Unknown table 'local' in field list
+ERROR 42S02: Unknown table 'local' in SELECT
 SELECT global.query_cache_size;
-ERROR 42S02: Unknown table 'global' in field list
+ERROR 42S02: Unknown table 'global' in SELECT
 SELECT query_cache_size = @@session.query_cache_size;
-ERROR 42S22: Unknown column 'query_cache_size' in 'field list'
+ERROR 42S22: Unknown column 'query_cache_size' in 'SELECT'
 SET @@global.query_cache_size = @start_value;
diff --git a/mysql-test/suite/sys_vars/r/query_cache_wlock_invalidate_basic.result b/mysql-test/suite/sys_vars/r/query_cache_wlock_invalidate_basic.result
index 96f42bbbda3..83dc3f0cb39 100644
--- a/mysql-test/suite/sys_vars/r/query_cache_wlock_invalidate_basic.result
+++ b/mysql-test/suite/sys_vars/r/query_cache_wlock_invalidate_basic.result
@@ -23,11 +23,11 @@ SELECT @@query_cache_wlock_invalidate;
 @@query_cache_wlock_invalidate
 1
 SELECT session.query_cache_wlock_invalidate;
-ERROR 42S02: Unknown table 'session' in field list
+ERROR 42S02: Unknown table 'session' in SELECT
 SELECT local.query_cache_wlock_invalidate;
-ERROR 42S02: Unknown table 'local' in field list
+ERROR 42S02: Unknown table 'local' in SELECT
 SELECT global.query_cache_wlock_invalidate;
-ERROR 42S02: Unknown table 'global' in field list
+ERROR 42S02: Unknown table 'global' in SELECT
 SET session query_cache_wlock_invalidate = 0;
 SELECT @@session.query_cache_wlock_invalidate;
 @@session.query_cache_wlock_invalidate
diff --git a/mysql-test/suite/sys_vars/r/query_prealloc_size_basic.result b/mysql-test/suite/sys_vars/r/query_prealloc_size_basic.result
index 9095dd56ea9..23cb61f0849 100644
--- a/mysql-test/suite/sys_vars/r/query_prealloc_size_basic.result
+++ b/mysql-test/suite/sys_vars/r/query_prealloc_size_basic.result
@@ -155,11 +155,11 @@ SELECT @@query_prealloc_size  ;
 @@query_prealloc_size
 1024
 SELECT local.query_prealloc_size  ;
-ERROR 42S02: Unknown table 'local' in field list
+ERROR 42S02: Unknown table 'local' in SELECT
 SELECT session.query_prealloc_size  ;
-ERROR 42S02: Unknown table 'session' in field list
+ERROR 42S02: Unknown table 'session' in SELECT
 SELECT query_prealloc_size   = @@session.query_prealloc_size  ;
-ERROR 42S22: Unknown column 'query_prealloc_size' in 'field list'
+ERROR 42S22: Unknown column 'query_prealloc_size' in 'SELECT'
 SET @@global.query_prealloc_size   = @start_global_value;
 SELECT @@global.query_prealloc_size  ;
 @@global.query_prealloc_size
diff --git a/mysql-test/suite/sys_vars/r/range_alloc_block_size_basic.result b/mysql-test/suite/sys_vars/r/range_alloc_block_size_basic.result
index 26b32b56e57..c31851806a6 100644
--- a/mysql-test/suite/sys_vars/r/range_alloc_block_size_basic.result
+++ b/mysql-test/suite/sys_vars/r/range_alloc_block_size_basic.result
@@ -172,11 +172,11 @@ SELECT @@range_alloc_block_size;
 @@range_alloc_block_size
 4096
 SELECT local.range_alloc_block_size;
-ERROR 42S02: Unknown table 'local' in field list
+ERROR 42S02: Unknown table 'local' in SELECT
 SELECT session.range_alloc_block_size;
-ERROR 42S02: Unknown table 'session' in field list
+ERROR 42S02: Unknown table 'session' in SELECT
 SELECT range_alloc_block_size = @@session.range_alloc_block_size;
-ERROR 42S22: Unknown column 'range_alloc_block_size' in 'field list'
+ERROR 42S22: Unknown column 'range_alloc_block_size' in 'SELECT'
 SET @@global.range_alloc_block_size = @start_global_value;
 SELECT @@global.range_alloc_block_size;
 @@global.range_alloc_block_size
diff --git a/mysql-test/suite/sys_vars/r/read_buffer_size_basic.result b/mysql-test/suite/sys_vars/r/read_buffer_size_basic.result
index bb1ed110ae2..000b4e7996b 100644
--- a/mysql-test/suite/sys_vars/r/read_buffer_size_basic.result
+++ b/mysql-test/suite/sys_vars/r/read_buffer_size_basic.result
@@ -180,11 +180,11 @@ SELECT @@read_buffer_size;
 @@read_buffer_size
 8192
 SELECT local.read_buffer_size;
-ERROR 42S02: Unknown table 'local' in field list
+ERROR 42S02: Unknown table 'local' in SELECT
 SELECT session.read_buffer_size;
-ERROR 42S02: Unknown table 'session' in field list
+ERROR 42S02: Unknown table 'session' in SELECT
 SELECT read_buffer_size = @@session.read_buffer_size;
-ERROR 42S22: Unknown column 'read_buffer_size' in 'field list'
+ERROR 42S22: Unknown column 'read_buffer_size' in 'SELECT'
 SET @@global.read_buffer_size = @start_global_value;
 SELECT @@global.read_buffer_size;
 @@global.read_buffer_size
diff --git a/mysql-test/suite/sys_vars/r/read_only_basic.result b/mysql-test/suite/sys_vars/r/read_only_basic.result
index 4048e9754c4..d765b7fcae0 100644
--- a/mysql-test/suite/sys_vars/r/read_only_basic.result
+++ b/mysql-test/suite/sys_vars/r/read_only_basic.result
@@ -103,11 +103,11 @@ SELECT @@read_only;
 @@read_only
 1
 SELECT local.read_only;
-ERROR 42S02: Unknown table 'local' in field list
+ERROR 42S02: Unknown table 'local' in SELECT
 SELECT global.read_only;
-ERROR 42S02: Unknown table 'global' in field list
+ERROR 42S02: Unknown table 'global' in SELECT
 SELECT read_only = @@session.read_only;
-ERROR 42S22: Unknown column 'read_only' in 'field list'
+ERROR 42S22: Unknown column 'read_only' in 'SELECT'
 SET @@global.read_only = @start_value;
 SELECT @@global.read_only;
 @@global.read_only
diff --git a/mysql-test/suite/sys_vars/r/read_rnd_buffer_size_basic.result b/mysql-test/suite/sys_vars/r/read_rnd_buffer_size_basic.result
index 8ee67e71b79..cbfb4dc12f9 100644
--- a/mysql-test/suite/sys_vars/r/read_rnd_buffer_size_basic.result
+++ b/mysql-test/suite/sys_vars/r/read_rnd_buffer_size_basic.result
@@ -124,11 +124,11 @@ SELECT @@read_rnd_buffer_size;
 @@read_rnd_buffer_size
 9100
 SELECT local.read_rnd_buffer_size;
-ERROR 42S02: Unknown table 'local' in field list
+ERROR 42S02: Unknown table 'local' in SELECT
 SELECT session.read_rnd_buffer_size;
-ERROR 42S02: Unknown table 'session' in field list
+ERROR 42S02: Unknown table 'session' in SELECT
 SELECT read_rnd_buffer_size = @@session.read_rnd_buffer_size;
-ERROR 42S22: Unknown column 'read_rnd_buffer_size' in 'field list'
+ERROR 42S22: Unknown column 'read_rnd_buffer_size' in 'SELECT'
 SET @@global.read_rnd_buffer_size = @start_global_value;
 SELECT @@global.read_rnd_buffer_size;
 @@global.read_rnd_buffer_size
diff --git a/mysql-test/suite/sys_vars/r/relay_log_purge_basic.result b/mysql-test/suite/sys_vars/r/relay_log_purge_basic.result
index e00be57692e..0d0873ab4dd 100644
--- a/mysql-test/suite/sys_vars/r/relay_log_purge_basic.result
+++ b/mysql-test/suite/sys_vars/r/relay_log_purge_basic.result
@@ -83,9 +83,9 @@ SELECT @@relay_log_purge = @@global.relay_log_purge;
 SET relay_log_purge = 1;
 ERROR HY000: Variable 'relay_log_purge' is a GLOBAL variable and should be set with SET GLOBAL
 SELECT global.relay_log_purge;
-ERROR 42S02: Unknown table 'global' in field list
+ERROR 42S02: Unknown table 'global' in SELECT
 SELECT relay_log_purge = @@session.relay_log_purge;
-ERROR 42S22: Unknown column 'relay_log_purge' in 'field list'
+ERROR 42S22: Unknown column 'relay_log_purge' in 'SELECT'
 SET @@global.relay_log_purge = @start_value;
 SELECT @@global.relay_log_purge;
 @@global.relay_log_purge
diff --git a/mysql-test/suite/sys_vars/r/secure_auth_basic.result b/mysql-test/suite/sys_vars/r/secure_auth_basic.result
index 66763fc5f8d..d82c5d7d411 100644
--- a/mysql-test/suite/sys_vars/r/secure_auth_basic.result
+++ b/mysql-test/suite/sys_vars/r/secure_auth_basic.result
@@ -19,7 +19,7 @@ SELECT @@secure_auth;
 @@secure_auth
 1
 SELECT global.secure_auth;
-ERROR 42S02: Unknown table 'global' in field list
+ERROR 42S02: Unknown table 'global' in SELECT
 SET global secure_auth = 1;
 Warnings:
 Warning	1287	'@@secure_auth' is deprecated and will be removed in a future release
diff --git a/mysql-test/suite/sys_vars/r/server_id_basic.result b/mysql-test/suite/sys_vars/r/server_id_basic.result
index a2b117c1332..34646b04734 100644
--- a/mysql-test/suite/sys_vars/r/server_id_basic.result
+++ b/mysql-test/suite/sys_vars/r/server_id_basic.result
@@ -117,7 +117,7 @@ SELECT @@server_id = @@global.server_id;
 '#---------------------FN_DYNVARS_001_10----------------------#'
 SET server_id = 2048;
 SELECT server_id;
-ERROR 42S22: Unknown column 'server_id' in 'field list'
+ERROR 42S22: Unknown column 'server_id' in 'SELECT'
 SELECT @@server_id;
 @@server_id
 2048
diff --git a/mysql-test/suite/sys_vars/r/slave_compressed_protocol_basic.result b/mysql-test/suite/sys_vars/r/slave_compressed_protocol_basic.result
index 039cce257e5..4be062fa3f8 100644
--- a/mysql-test/suite/sys_vars/r/slave_compressed_protocol_basic.result
+++ b/mysql-test/suite/sys_vars/r/slave_compressed_protocol_basic.result
@@ -15,7 +15,7 @@ SELECT @@slave_compressed_protocol;
 @@slave_compressed_protocol
 0
 SELECT global.slave_compressed_protocol;
-ERROR 42S02: Unknown table 'global' in field list
+ERROR 42S02: Unknown table 'global' in SELECT
 SET global slave_compressed_protocol = 1;
 SELECT @@global.slave_compressed_protocol;
 @@global.slave_compressed_protocol
diff --git a/mysql-test/suite/sys_vars/r/slave_ddl_exec_mode_basic.result b/mysql-test/suite/sys_vars/r/slave_ddl_exec_mode_basic.result
index e758e61f648..ca29826bd8c 100644
--- a/mysql-test/suite/sys_vars/r/slave_ddl_exec_mode_basic.result
+++ b/mysql-test/suite/sys_vars/r/slave_ddl_exec_mode_basic.result
@@ -21,7 +21,7 @@ COUNT(@@GLOBAL.slave_ddl_exec_mode)
 1
 1 Expected
 SELECT slave_ddl_exec_mode = @@SESSION.version;
-ERROR 42S22: Unknown column 'slave_ddl_exec_mode' in 'field list'
+ERROR 42S22: Unknown column 'slave_ddl_exec_mode' in 'SELECT'
 Expected error 'Readonly variable'
 SET @@GLOBAL.slave_ddl_exec_mode=STRICT;
 SELECT @@GLOBAL.slave_ddl_exec_mode;
diff --git a/mysql-test/suite/sys_vars/r/slave_max_allowed_packet_basic.result b/mysql-test/suite/sys_vars/r/slave_max_allowed_packet_basic.result
index 9cbfb9b2c11..63d2b72f963 100644
--- a/mysql-test/suite/sys_vars/r/slave_max_allowed_packet_basic.result
+++ b/mysql-test/suite/sys_vars/r/slave_max_allowed_packet_basic.result
@@ -132,11 +132,11 @@ SELECT @@slave_max_allowed_packet;
 @@slave_max_allowed_packet
 4096
 SELECT local.slave_max_allowed_packet;
-ERROR 42S02: Unknown table 'local' in field list
+ERROR 42S02: Unknown table 'local' in SELECT
 SELECT global.slave_max_allowed_packet;
-ERROR 42S02: Unknown table 'global' in field list
+ERROR 42S02: Unknown table 'global' in SELECT
 SELECT slave_max_allowed_packet = @@session.slave_max_allowed_packet;
-ERROR 42S22: Unknown column 'slave_max_allowed_packet' in 'field list'
+ERROR 42S22: Unknown column 'slave_max_allowed_packet' in 'SELECT'
 SET @@global.slave_max_allowed_packet = @start_value;
 SELECT @@global.slave_max_allowed_packet;
 @@global.slave_max_allowed_packet
diff --git a/mysql-test/suite/sys_vars/r/slave_net_timeout_basic.result b/mysql-test/suite/sys_vars/r/slave_net_timeout_basic.result
index 1b4d62c6c00..8f9f52869d3 100644
--- a/mysql-test/suite/sys_vars/r/slave_net_timeout_basic.result
+++ b/mysql-test/suite/sys_vars/r/slave_net_timeout_basic.result
@@ -115,7 +115,7 @@ SELECT @@slave_net_timeout = @@global.slave_net_timeout;
 SET slave_net_timeout = 2048;
 ERROR HY000: Variable 'slave_net_timeout' is a GLOBAL variable and should be set with SET GLOBAL
 SELECT slave_net_timeout;
-ERROR 42S22: Unknown column 'slave_net_timeout' in 'field list'
+ERROR 42S22: Unknown column 'slave_net_timeout' in 'SELECT'
 SELECT @@slave_net_timeout;
 @@slave_net_timeout
 3600
diff --git a/mysql-test/suite/sys_vars/r/slave_transaction_retries_basic.result b/mysql-test/suite/sys_vars/r/slave_transaction_retries_basic.result
index 86a760a5386..e42ed53dea2 100644
--- a/mysql-test/suite/sys_vars/r/slave_transaction_retries_basic.result
+++ b/mysql-test/suite/sys_vars/r/slave_transaction_retries_basic.result
@@ -109,7 +109,7 @@ SELECT @@slave_transaction_retries = @@global.slave_transaction_retries;
 SET slave_transaction_retries = 2048;
 ERROR HY000: Variable 'slave_transaction_retries' is a GLOBAL variable and should be set with SET GLOBAL
 SELECT slave_transaction_retries;
-ERROR 42S22: Unknown column 'slave_transaction_retries' in 'field list'
+ERROR 42S22: Unknown column 'slave_transaction_retries' in 'SELECT'
 SELECT @@slave_transaction_retries;
 @@slave_transaction_retries
 3600
diff --git a/mysql-test/suite/sys_vars/r/slave_transaction_retry_interval_basic.result b/mysql-test/suite/sys_vars/r/slave_transaction_retry_interval_basic.result
index 8be45f83341..7e5f892ece3 100644
--- a/mysql-test/suite/sys_vars/r/slave_transaction_retry_interval_basic.result
+++ b/mysql-test/suite/sys_vars/r/slave_transaction_retry_interval_basic.result
@@ -115,7 +115,7 @@ SELECT @@slave_transaction_retry_interval = @@global.slave_transaction_retry_int
 SET slave_transaction_retry_interval = 2048;
 ERROR HY000: Variable 'slave_transaction_retry_interval' is a GLOBAL variable and should be set with SET GLOBAL
 SELECT slave_transaction_retry_interval;
-ERROR 42S22: Unknown column 'slave_transaction_retry_interval' in 'field list'
+ERROR 42S22: Unknown column 'slave_transaction_retry_interval' in 'SELECT'
 SELECT @@slave_transaction_retry_interval;
 @@slave_transaction_retry_interval
 3600
diff --git a/mysql-test/suite/sys_vars/r/slow_launch_time_basic.result b/mysql-test/suite/sys_vars/r/slow_launch_time_basic.result
index 3acd29b0c62..0e1abe6bdbe 100644
--- a/mysql-test/suite/sys_vars/r/slow_launch_time_basic.result
+++ b/mysql-test/suite/sys_vars/r/slow_launch_time_basic.result
@@ -118,11 +118,11 @@ SELECT @@slow_launch_time;
 @@slow_launch_time
 1
 SELECT local.slow_launch_time;
-ERROR 42S02: Unknown table 'local' in field list
+ERROR 42S02: Unknown table 'local' in SELECT
 SELECT global.slow_launch_time;
-ERROR 42S02: Unknown table 'global' in field list
+ERROR 42S02: Unknown table 'global' in SELECT
 SELECT slow_launch_time = @@session.slow_launch_time;
-ERROR 42S22: Unknown column 'slow_launch_time' in 'field list'
+ERROR 42S22: Unknown column 'slow_launch_time' in 'SELECT'
 SET @@global.slow_launch_time = @start_value;
 SELECT @@global.slow_launch_time;
 @@global.slow_launch_time
diff --git a/mysql-test/suite/sys_vars/r/slow_query_log_basic.result b/mysql-test/suite/sys_vars/r/slow_query_log_basic.result
index 17dfdeea3f3..e6a19292db5 100644
--- a/mysql-test/suite/sys_vars/r/slow_query_log_basic.result
+++ b/mysql-test/suite/sys_vars/r/slow_query_log_basic.result
@@ -85,11 +85,11 @@ SELECT @@slow_query_log = @@global.slow_query_log;
 0
 '#---------------------FN_DYNVARS_004_09----------------------#'
 SELECT local.slow_query_log;
-ERROR 42S02: Unknown table 'local' in field list
+ERROR 42S02: Unknown table 'local' in SELECT
 SELECT global.slow_query_log;
-ERROR 42S02: Unknown table 'global' in field list
+ERROR 42S02: Unknown table 'global' in SELECT
 SELECT slow_query_log = @@session.slow_query_log;
-ERROR 42S22: Unknown column 'slow_query_log' in 'field list'
+ERROR 42S22: Unknown column 'slow_query_log' in 'SELECT'
 SET @@global.slow_query_log = @start_value;
 SELECT @@global.slow_query_log;
 @@global.slow_query_log
diff --git a/mysql-test/suite/sys_vars/r/sort_buffer_size_basic.result b/mysql-test/suite/sys_vars/r/sort_buffer_size_basic.result
index 04e1514dd13..a44f20886ac 100644
--- a/mysql-test/suite/sys_vars/r/sort_buffer_size_basic.result
+++ b/mysql-test/suite/sys_vars/r/sort_buffer_size_basic.result
@@ -132,10 +132,10 @@ SELECT @@sort_buffer_size;
 @@sort_buffer_size
 9100
 SELECT local.sort_buffer_size;
-ERROR 42S02: Unknown table 'local' in field list
+ERROR 42S02: Unknown table 'local' in SELECT
 SELECT session.sort_buffer_size;
-ERROR 42S02: Unknown table 'session' in field list
+ERROR 42S02: Unknown table 'session' in SELECT
 SELECT sort_buffer_size = @@session.sort_buffer_size;
-ERROR 42S22: Unknown column 'sort_buffer_size' in 'field list'
+ERROR 42S22: Unknown column 'sort_buffer_size' in 'SELECT'
 SET @@global.sort_buffer_size = @start_global_value;
 SET @@session.sort_buffer_size = @start_session_value;
diff --git a/mysql-test/suite/sys_vars/r/sql_big_selects_basic.result b/mysql-test/suite/sys_vars/r/sql_big_selects_basic.result
index 98f05bda488..c0e3a570fd3 100644
--- a/mysql-test/suite/sys_vars/r/sql_big_selects_basic.result
+++ b/mysql-test/suite/sys_vars/r/sql_big_selects_basic.result
@@ -14,9 +14,9 @@ SELECT @@sql_big_selects;
 @@sql_big_selects
 1
 SELECT session.sql_big_selects;
-ERROR 42S02: Unknown table 'session' in field list
+ERROR 42S02: Unknown table 'session' in SELECT
 SELECT local.sql_big_selects;
-ERROR 42S02: Unknown table 'local' in field list
+ERROR 42S02: Unknown table 'local' in SELECT
 SET session sql_big_selects = 0;
 SELECT @@session.sql_big_selects;
 @@session.sql_big_selects
diff --git a/mysql-test/suite/sys_vars/r/sql_buffer_result_basic.result b/mysql-test/suite/sys_vars/r/sql_buffer_result_basic.result
index 2dfdcb26898..5408919276a 100644
--- a/mysql-test/suite/sys_vars/r/sql_buffer_result_basic.result
+++ b/mysql-test/suite/sys_vars/r/sql_buffer_result_basic.result
@@ -19,9 +19,9 @@ SELECT @@sql_buffer_result;
 @@sql_buffer_result
 1
 SELECT session.sql_buffer_result;
-ERROR 42S02: Unknown table 'session' in field list
+ERROR 42S02: Unknown table 'session' in SELECT
 SELECT local.sql_buffer_result;
-ERROR 42S02: Unknown table 'local' in field list
+ERROR 42S02: Unknown table 'local' in SELECT
 SET session sql_buffer_result = 0;
 SELECT @@session.sql_buffer_result;
 @@session.sql_buffer_result
diff --git a/mysql-test/suite/sys_vars/r/sql_log_bin_basic.result b/mysql-test/suite/sys_vars/r/sql_log_bin_basic.result
index 909c434340c..e97cc403ee5 100644
--- a/mysql-test/suite/sys_vars/r/sql_log_bin_basic.result
+++ b/mysql-test/suite/sys_vars/r/sql_log_bin_basic.result
@@ -19,9 +19,9 @@ SELECT @@sql_log_bin;
 @@sql_log_bin
 1
 SELECT session.sql_log_bin;
-ERROR 42S02: Unknown table 'session' in field list
+ERROR 42S02: Unknown table 'session' in SELECT
 SELECT local.sql_log_bin;
-ERROR 42S02: Unknown table 'local' in field list
+ERROR 42S02: Unknown table 'local' in SELECT
 SET session sql_log_bin = 0;
 SELECT @@session.sql_log_bin;
 @@session.sql_log_bin
diff --git a/mysql-test/suite/sys_vars/r/sql_log_off_basic.result b/mysql-test/suite/sys_vars/r/sql_log_off_basic.result
index c2ffa17c5fe..6153e1939ff 100644
--- a/mysql-test/suite/sys_vars/r/sql_log_off_basic.result
+++ b/mysql-test/suite/sys_vars/r/sql_log_off_basic.result
@@ -19,9 +19,9 @@ SELECT @@sql_log_off;
 @@sql_log_off
 1
 SELECT session.sql_log_off;
-ERROR 42S02: Unknown table 'session' in field list
+ERROR 42S02: Unknown table 'session' in SELECT
 SELECT local.sql_log_off;
-ERROR 42S02: Unknown table 'local' in field list
+ERROR 42S02: Unknown table 'local' in SELECT
 SET session sql_log_off = 0;
 SELECT @@session.sql_log_off;
 @@session.sql_log_off
diff --git a/mysql-test/suite/sys_vars/r/sql_notes_basic.result b/mysql-test/suite/sys_vars/r/sql_notes_basic.result
index 7a54f90f8b7..23274ad2868 100644
--- a/mysql-test/suite/sys_vars/r/sql_notes_basic.result
+++ b/mysql-test/suite/sys_vars/r/sql_notes_basic.result
@@ -19,9 +19,9 @@ SELECT @@sql_notes;
 @@sql_notes
 1
 SELECT session.sql_notes;
-ERROR 42S02: Unknown table 'session' in field list
+ERROR 42S02: Unknown table 'session' in SELECT
 SELECT local.sql_notes;
-ERROR 42S02: Unknown table 'local' in field list
+ERROR 42S02: Unknown table 'local' in SELECT
 SET session sql_notes = 0;
 SELECT @@session.sql_notes;
 @@session.sql_notes
diff --git a/mysql-test/suite/sys_vars/r/sql_quote_show_create_basic.result b/mysql-test/suite/sys_vars/r/sql_quote_show_create_basic.result
index 8cf99233ef9..cb2175cfe34 100644
--- a/mysql-test/suite/sys_vars/r/sql_quote_show_create_basic.result
+++ b/mysql-test/suite/sys_vars/r/sql_quote_show_create_basic.result
@@ -19,9 +19,9 @@ SELECT @@sql_quote_show_create;
 @@sql_quote_show_create
 1
 SELECT session.sql_quote_show_create;
-ERROR 42S02: Unknown table 'session' in field list
+ERROR 42S02: Unknown table 'session' in SELECT
 SELECT local.sql_quote_show_create;
-ERROR 42S02: Unknown table 'local' in field list
+ERROR 42S02: Unknown table 'local' in SELECT
 SET session sql_quote_show_create = 0;
 SELECT @@session.sql_quote_show_create;
 @@session.sql_quote_show_create
diff --git a/mysql-test/suite/sys_vars/r/sql_safe_updates_basic.result b/mysql-test/suite/sys_vars/r/sql_safe_updates_basic.result
index 91bfcb2377e..bdb5339e643 100644
--- a/mysql-test/suite/sys_vars/r/sql_safe_updates_basic.result
+++ b/mysql-test/suite/sys_vars/r/sql_safe_updates_basic.result
@@ -19,9 +19,9 @@ SELECT @@sql_safe_updates;
 @@sql_safe_updates
 1
 SELECT session.sql_safe_updates;
-ERROR 42S02: Unknown table 'session' in field list
+ERROR 42S02: Unknown table 'session' in SELECT
 SELECT local.sql_safe_updates;
-ERROR 42S02: Unknown table 'local' in field list
+ERROR 42S02: Unknown table 'local' in SELECT
 SET session sql_safe_updates = 0;
 SELECT @@session.sql_safe_updates;
 @@session.sql_safe_updates
diff --git a/mysql-test/suite/sys_vars/r/sql_warnings_basic.result b/mysql-test/suite/sys_vars/r/sql_warnings_basic.result
index 762182336c3..0ccf9585496 100644
--- a/mysql-test/suite/sys_vars/r/sql_warnings_basic.result
+++ b/mysql-test/suite/sys_vars/r/sql_warnings_basic.result
@@ -19,9 +19,9 @@ SELECT @@sql_warnings;
 @@sql_warnings
 1
 SELECT session.sql_warnings;
-ERROR 42S02: Unknown table 'session' in field list
+ERROR 42S02: Unknown table 'session' in SELECT
 SELECT local.sql_warnings;
-ERROR 42S02: Unknown table 'local' in field list
+ERROR 42S02: Unknown table 'local' in SELECT
 SET session sql_warnings = 0;
 SELECT @@session.sql_warnings;
 @@session.sql_warnings
diff --git a/mysql-test/suite/sys_vars/r/ssl_ca_basic.result b/mysql-test/suite/sys_vars/r/ssl_ca_basic.result
index 618c5558c3e..dbd3030726b 100644
--- a/mysql-test/suite/sys_vars/r/ssl_ca_basic.result
+++ b/mysql-test/suite/sys_vars/r/ssl_ca_basic.result
@@ -49,5 +49,5 @@ COUNT(@@GLOBAL.ssl_ca)
 1
 1 Expected
 SELECT ssl_ca = @@SESSION.ssl_ca;
-ERROR 42S22: Unknown column 'ssl_ca' in 'field list'
+ERROR 42S22: Unknown column 'ssl_ca' in 'SELECT'
 Expected error 'Readonly variable'
diff --git a/mysql-test/suite/sys_vars/r/ssl_capath_basic.result b/mysql-test/suite/sys_vars/r/ssl_capath_basic.result
index f04b85b956f..885d8d0bbf7 100644
--- a/mysql-test/suite/sys_vars/r/ssl_capath_basic.result
+++ b/mysql-test/suite/sys_vars/r/ssl_capath_basic.result
@@ -49,5 +49,5 @@ COUNT(@@GLOBAL.ssl_capath)
 0
 0 Expected
 SELECT ssl_capath = @@SESSION.ssl_capath;
-ERROR 42S22: Unknown column 'ssl_capath' in 'field list'
+ERROR 42S22: Unknown column 'ssl_capath' in 'SELECT'
 Expected error 'Readonly variable'
diff --git a/mysql-test/suite/sys_vars/r/ssl_cert_basic.result b/mysql-test/suite/sys_vars/r/ssl_cert_basic.result
index 1571730a653..d560bd86479 100644
--- a/mysql-test/suite/sys_vars/r/ssl_cert_basic.result
+++ b/mysql-test/suite/sys_vars/r/ssl_cert_basic.result
@@ -49,5 +49,5 @@ COUNT(@@GLOBAL.ssl_cert)
 1
 1 Expected
 SELECT ssl_cert = @@SESSION.ssl_cert;
-ERROR 42S22: Unknown column 'ssl_cert' in 'field list'
+ERROR 42S22: Unknown column 'ssl_cert' in 'SELECT'
 Expected error 'Readonly variable'
diff --git a/mysql-test/suite/sys_vars/r/ssl_cipher_basic.result b/mysql-test/suite/sys_vars/r/ssl_cipher_basic.result
index 0eed40d0580..c5f97ad19a5 100644
--- a/mysql-test/suite/sys_vars/r/ssl_cipher_basic.result
+++ b/mysql-test/suite/sys_vars/r/ssl_cipher_basic.result
@@ -49,5 +49,5 @@ COUNT(@@GLOBAL.ssl_cipher)
 0
 0 Expected
 SELECT ssl_cipher = @@SESSION.ssl_cipher;
-ERROR 42S22: Unknown column 'ssl_cipher' in 'field list'
+ERROR 42S22: Unknown column 'ssl_cipher' in 'SELECT'
 Expected error 'Readonly variable'
diff --git a/mysql-test/suite/sys_vars/r/ssl_key_basic.result b/mysql-test/suite/sys_vars/r/ssl_key_basic.result
index 0869a2915e3..6e2ed43323c 100644
--- a/mysql-test/suite/sys_vars/r/ssl_key_basic.result
+++ b/mysql-test/suite/sys_vars/r/ssl_key_basic.result
@@ -49,5 +49,5 @@ COUNT(@@GLOBAL.ssl_key)
 1
 1 Expected
 SELECT ssl_key = @@SESSION.ssl_key;
-ERROR 42S22: Unknown column 'ssl_key' in 'field list'
+ERROR 42S22: Unknown column 'ssl_key' in 'SELECT'
 Expected error 'Readonly variable'
diff --git a/mysql-test/suite/sys_vars/r/storage_engine_basic.result b/mysql-test/suite/sys_vars/r/storage_engine_basic.result
index 013c36c80a0..5257fbccf10 100644
--- a/mysql-test/suite/sys_vars/r/storage_engine_basic.result
+++ b/mysql-test/suite/sys_vars/r/storage_engine_basic.result
@@ -123,11 +123,11 @@ SELECT @@storage_engine;
 @@storage_engine
 MEMORY
 SELECT local.storage_engine;
-ERROR 42S02: Unknown table 'local' in field list
+ERROR 42S02: Unknown table 'local' in SELECT
 SELECT session.storage_engine;
-ERROR 42S02: Unknown table 'session' in field list
+ERROR 42S02: Unknown table 'session' in SELECT
 SELECT storage_engine = @@session.storage_engine;
-ERROR 42S22: Unknown column 'storage_engine' in 'field list'
+ERROR 42S22: Unknown column 'storage_engine' in 'SELECT'
 SET @@storage_engine = @start_global_value;
 Warnings:
 Warning	1287	'@@storage_engine' is deprecated and will be removed in a future release. Please use '@@default_storage_engine' instead
diff --git a/mysql-test/suite/sys_vars/r/stored_program_cache_func.result b/mysql-test/suite/sys_vars/r/stored_program_cache_func.result
index 11151847d6b..ab1728d7337 100644
--- a/mysql-test/suite/sys_vars/r/stored_program_cache_func.result
+++ b/mysql-test/suite/sys_vars/r/stored_program_cache_func.result
@@ -41,7 +41,7 @@ end |
 call pr(1);
 b
 call pr(2);
-ERROR 42S22: Unknown column 'test.t1.b' in 'field list'
+ERROR 42S22: Unknown column 'test.t1.b' in 'SELECT'
 drop table t1;
 set global stored_program_cache=0;
 call pr(1);
diff --git a/mysql-test/suite/sys_vars/r/sync_binlog_basic.result b/mysql-test/suite/sys_vars/r/sync_binlog_basic.result
index e1c7e69d0f5..3d6cf54719b 100644
--- a/mysql-test/suite/sys_vars/r/sync_binlog_basic.result
+++ b/mysql-test/suite/sys_vars/r/sync_binlog_basic.result
@@ -85,9 +85,9 @@ SELECT @@sync_binlog;
 @@sync_binlog
 4294967295
 SELECT local.sync_binlog;
-ERROR 42S02: Unknown table 'local' in field list
+ERROR 42S02: Unknown table 'local' in SELECT
 SELECT global.sync_binlog;
-ERROR 42S02: Unknown table 'global' in field list
+ERROR 42S02: Unknown table 'global' in SELECT
 SELECT sync_binlog = @@session.sync_binlog;
-ERROR 42S22: Unknown column 'sync_binlog' in 'field list'
+ERROR 42S22: Unknown column 'sync_binlog' in 'SELECT'
 SET @@global.sync_binlog = @start_value;
diff --git a/mysql-test/suite/sys_vars/r/sync_frm_basic.result b/mysql-test/suite/sys_vars/r/sync_frm_basic.result
index ce9d0a1f358..2ce6488aa11 100644
--- a/mysql-test/suite/sys_vars/r/sync_frm_basic.result
+++ b/mysql-test/suite/sys_vars/r/sync_frm_basic.result
@@ -86,9 +86,9 @@ SELECT @@sync_frm;
 @@sync_frm
 1
 SELECT global.sync_frm;
-ERROR 42S02: Unknown table 'global' in field list
+ERROR 42S02: Unknown table 'global' in SELECT
 SELECT sync_frm = @@session.sync_frm;
-ERROR 42S22: Unknown column 'sync_frm' in 'field list'
+ERROR 42S22: Unknown column 'sync_frm' in 'SELECT'
 SET @@global.sync_frm = @start_value;
 SELECT @@global.sync_frm;
 @@global.sync_frm
diff --git a/mysql-test/suite/sys_vars/r/system_time_zone_basic.result b/mysql-test/suite/sys_vars/r/system_time_zone_basic.result
index c398e5bd93b..94b955a1be2 100644
--- a/mysql-test/suite/sys_vars/r/system_time_zone_basic.result
+++ b/mysql-test/suite/sys_vars/r/system_time_zone_basic.result
@@ -49,5 +49,5 @@ COUNT(@@GLOBAL.system_time_zone)
 1
 1 Expected
 SELECT system_time_zone = @@SESSION.system_time_zone;
-ERROR 42S22: Unknown column 'system_time_zone' in 'field list'
+ERROR 42S22: Unknown column 'system_time_zone' in 'SELECT'
 Expected error 'Readonly variable'
diff --git a/mysql-test/suite/sys_vars/r/table_definition_cache_basic.result b/mysql-test/suite/sys_vars/r/table_definition_cache_basic.result
index a3d86108862..9075f0a789c 100644
--- a/mysql-test/suite/sys_vars/r/table_definition_cache_basic.result
+++ b/mysql-test/suite/sys_vars/r/table_definition_cache_basic.result
@@ -92,7 +92,7 @@ SELECT @@table_definition_cache = @@global.table_definition_cache;
 SET table_definition_cache = 1;
 ERROR HY000: Variable 'table_definition_cache' is a GLOBAL variable and should be set with SET GLOBAL
 SELECT global.table_definition_cache;
-ERROR 42S02: Unknown table 'global' in field list
+ERROR 42S02: Unknown table 'global' in SELECT
 SELECT table_definition_cache = @@session.table_definition_cache;
-ERROR 42S22: Unknown column 'table_definition_cache' in 'field list'
+ERROR 42S22: Unknown column 'table_definition_cache' in 'SELECT'
 SET @@global.table_definition_cache = @start_value;
diff --git a/mysql-test/suite/sys_vars/r/table_open_cache_basic.result b/mysql-test/suite/sys_vars/r/table_open_cache_basic.result
index 2d8e9005f81..b0e6596cf80 100644
--- a/mysql-test/suite/sys_vars/r/table_open_cache_basic.result
+++ b/mysql-test/suite/sys_vars/r/table_open_cache_basic.result
@@ -93,7 +93,7 @@ SELECT @@table_open_cache = @@global.table_open_cache ;
 SET table_open_cache = 8;
 ERROR HY000: Variable 'table_open_cache' is a GLOBAL variable and should be set with SET GLOBAL
 SELECT global.table_open_cache ;
-ERROR 42S02: Unknown table 'global' in field list
+ERROR 42S02: Unknown table 'global' in SELECT
 SELECT table_open_cache = @@session.table_open_cache ;
-ERROR 42S22: Unknown column 'table_open_cache' in 'field list'
+ERROR 42S22: Unknown column 'table_open_cache' in 'SELECT'
 SET @@global.table_open_cache = @start_value;
diff --git a/mysql-test/suite/sys_vars/r/thread_handling_basic.result b/mysql-test/suite/sys_vars/r/thread_handling_basic.result
index f5a333ac033..789ff2e7ba0 100644
--- a/mysql-test/suite/sys_vars/r/thread_handling_basic.result
+++ b/mysql-test/suite/sys_vars/r/thread_handling_basic.result
@@ -51,5 +51,5 @@ COUNT(@@GLOBAL.thread_handling)
 1
 1 Expected
 SELECT thread_handling = @@SESSION.thread_handling;
-ERROR 42S22: Unknown column 'thread_handling' in 'field list'
+ERROR 42S22: Unknown column 'thread_handling' in 'SELECT'
 Expected error 'Readonly variable'
diff --git a/mysql-test/suite/sys_vars/r/time_zone_basic.result b/mysql-test/suite/sys_vars/r/time_zone_basic.result
index 6115eeeaf9e..dd0cac74720 100644
--- a/mysql-test/suite/sys_vars/r/time_zone_basic.result
+++ b/mysql-test/suite/sys_vars/r/time_zone_basic.result
@@ -215,11 +215,11 @@ SELECT @@time_zone;
 @@time_zone
 +01:00
 SELECT local.time_zone;
-ERROR 42S02: Unknown table 'local' in field list
+ERROR 42S02: Unknown table 'local' in SELECT
 SELECT session.time_zone;
-ERROR 42S02: Unknown table 'session' in field list
+ERROR 42S02: Unknown table 'session' in SELECT
 SELECT time_zone = @@session.time_zone;
-ERROR 42S22: Unknown column 'time_zone' in 'field list'
+ERROR 42S22: Unknown column 'time_zone' in 'SELECT'
 SET @@time_zone = @session_start_value;
 SELECT @@time_zone;
 @@time_zone
diff --git a/mysql-test/suite/sys_vars/r/timestamp_basic.result b/mysql-test/suite/sys_vars/r/timestamp_basic.result
index ecc2340f298..a662c89fd71 100644
--- a/mysql-test/suite/sys_vars/r/timestamp_basic.result
+++ b/mysql-test/suite/sys_vars/r/timestamp_basic.result
@@ -64,9 +64,9 @@ SELECT @@timestamp;
 @@timestamp
 1.000000
 SELECT local.timestamp;
-ERROR 42S02: Unknown table 'local' in field list
+ERROR 42S02: Unknown table 'local' in SELECT
 SELECT session.timestamp;
-ERROR 42S02: Unknown table 'session' in field list
+ERROR 42S02: Unknown table 'session' in SELECT
 SELECT timestamp = @@session.timestamp;
-ERROR 42S22: Unknown column 'timestamp' in 'field list'
+ERROR 42S22: Unknown column 'timestamp' in 'SELECT'
 SET @@timestamp = @session_start_value;
diff --git a/mysql-test/suite/sys_vars/r/tmp_disk_table_size_basic.result b/mysql-test/suite/sys_vars/r/tmp_disk_table_size_basic.result
index 81453d72274..96314c64de4 100644
--- a/mysql-test/suite/sys_vars/r/tmp_disk_table_size_basic.result
+++ b/mysql-test/suite/sys_vars/r/tmp_disk_table_size_basic.result
@@ -137,11 +137,11 @@ SELECT @@tmp_disk_table_size;
 @@tmp_disk_table_size
 1027
 SELECT local.tmp_disk_table_size;
-ERROR 42S02: Unknown table 'local' in field list
+ERROR 42S02: Unknown table 'local' in SELECT
 SELECT global.tmp_disk_table_size;
-ERROR 42S02: Unknown table 'global' in field list
+ERROR 42S02: Unknown table 'global' in SELECT
 SELECT tmp_disk_table_size = @@session.tmp_disk_table_size;
-ERROR 42S22: Unknown column 'tmp_disk_table_size' in 'field list'
+ERROR 42S22: Unknown column 'tmp_disk_table_size' in 'SELECT'
 #
 # Beginning of 10.4 test
 #
diff --git a/mysql-test/suite/sys_vars/r/tmpdir_basic.result b/mysql-test/suite/sys_vars/r/tmpdir_basic.result
index 613cc8ec3cd..b05d72933f2 100644
--- a/mysql-test/suite/sys_vars/r/tmpdir_basic.result
+++ b/mysql-test/suite/sys_vars/r/tmpdir_basic.result
@@ -49,5 +49,5 @@ COUNT(@@GLOBAL.tmpdir)
 1
 1 Expected
 SELECT tmpdir = @@SESSION.tmpdir;
-ERROR 42S22: Unknown column 'tmpdir' in 'field list'
+ERROR 42S22: Unknown column 'tmpdir' in 'SELECT'
 Expected error 'Readonly variable'
diff --git a/mysql-test/suite/sys_vars/r/transaction_alloc_block_size_basic.result b/mysql-test/suite/sys_vars/r/transaction_alloc_block_size_basic.result
index 719adb67573..8d36354a7bb 100644
--- a/mysql-test/suite/sys_vars/r/transaction_alloc_block_size_basic.result
+++ b/mysql-test/suite/sys_vars/r/transaction_alloc_block_size_basic.result
@@ -159,11 +159,11 @@ SELECT @@transaction_alloc_block_size;
 @@transaction_alloc_block_size
 1024
 SELECT local.transaction_alloc_block_size;
-ERROR 42S02: Unknown table 'local' in field list
+ERROR 42S02: Unknown table 'local' in SELECT
 SELECT session.transaction_alloc_block_size;
-ERROR 42S02: Unknown table 'session' in field list
+ERROR 42S02: Unknown table 'session' in SELECT
 SELECT transaction_alloc_block_size = @@session.transaction_alloc_block_size;
-ERROR 42S22: Unknown column 'transaction_alloc_block_size' in 'field list'
+ERROR 42S22: Unknown column 'transaction_alloc_block_size' in 'SELECT'
 SET @@global.transaction_alloc_block_size = @start_global_value;
 SELECT @@global.transaction_alloc_block_size;
 @@global.transaction_alloc_block_size
diff --git a/mysql-test/suite/sys_vars/r/transaction_prealloc_size_basic.result b/mysql-test/suite/sys_vars/r/transaction_prealloc_size_basic.result
index be54302689d..12a36bb0a7a 100644
--- a/mysql-test/suite/sys_vars/r/transaction_prealloc_size_basic.result
+++ b/mysql-test/suite/sys_vars/r/transaction_prealloc_size_basic.result
@@ -153,11 +153,11 @@ SELECT @@transaction_prealloc_size;
 @@transaction_prealloc_size
 1024
 SELECT local.transaction_prealloc_size;
-ERROR 42S02: Unknown table 'local' in field list
+ERROR 42S02: Unknown table 'local' in SELECT
 SELECT session.transaction_prealloc_size;
-ERROR 42S02: Unknown table 'session' in field list
+ERROR 42S02: Unknown table 'session' in SELECT
 SELECT transaction_prealloc_size = @@session.transaction_prealloc_size;
-ERROR 42S22: Unknown column 'transaction_prealloc_size' in 'field list'
+ERROR 42S22: Unknown column 'transaction_prealloc_size' in 'SELECT'
 SET @@global.transaction_prealloc_size = @start_global_value;
 SELECT @@global.transaction_prealloc_size;
 @@global.transaction_prealloc_size
diff --git a/mysql-test/suite/sys_vars/r/tx_read_only_basic.result b/mysql-test/suite/sys_vars/r/tx_read_only_basic.result
index 3750145083f..7eabba108ff 100644
--- a/mysql-test/suite/sys_vars/r/tx_read_only_basic.result
+++ b/mysql-test/suite/sys_vars/r/tx_read_only_basic.result
@@ -164,7 +164,7 @@ SELECT @@tx_read_only;
 1
 # name1.name2 refers to database_name.table_name
 SELECT session.tx_read_only;
-ERROR 42S02: Unknown table 'session' in field list
+ERROR 42S02: Unknown table 'session' in SELECT
 ####################################
 #     Restore initial value        #
 ####################################
diff --git a/mysql-test/suite/sys_vars/r/unique_checks_basic.result b/mysql-test/suite/sys_vars/r/unique_checks_basic.result
index 83fb9edb4cd..5cc1d9fdba0 100644
--- a/mysql-test/suite/sys_vars/r/unique_checks_basic.result
+++ b/mysql-test/suite/sys_vars/r/unique_checks_basic.result
@@ -73,11 +73,11 @@ SELECT @@unique_checks;
 @@unique_checks
 1
 SELECT local.unique_checks;
-ERROR 42S02: Unknown table 'local' in field list
+ERROR 42S02: Unknown table 'local' in SELECT
 SELECT session.unique_checks;
-ERROR 42S02: Unknown table 'session' in field list
+ERROR 42S02: Unknown table 'session' in SELECT
 SELECT unique_checks = @@session.unique_checks;
-ERROR 42S22: Unknown column 'unique_checks' in 'field list'
+ERROR 42S22: Unknown column 'unique_checks' in 'SELECT'
 SET @@session.unique_checks = @start_session_value;
 SELECT @@session.unique_checks;
 @@session.unique_checks
diff --git a/mysql-test/suite/sys_vars/r/updatable_views_with_limit_basic.result b/mysql-test/suite/sys_vars/r/updatable_views_with_limit_basic.result
index fb31ae7f10a..42cd8d817e3 100644
--- a/mysql-test/suite/sys_vars/r/updatable_views_with_limit_basic.result
+++ b/mysql-test/suite/sys_vars/r/updatable_views_with_limit_basic.result
@@ -168,11 +168,11 @@ SELECT @@updatable_views_with_limit;
 @@updatable_views_with_limit
 YES
 SELECT local.updatable_views_with_limit;
-ERROR 42S02: Unknown table 'local' in field list
+ERROR 42S02: Unknown table 'local' in SELECT
 SELECT session.updatable_views_with_limit;
-ERROR 42S02: Unknown table 'session' in field list
+ERROR 42S02: Unknown table 'session' in SELECT
 SELECT updatable_views_with_limit = @@session.updatable_views_with_limit;
-ERROR 42S22: Unknown column 'updatable_views_with_limit' in 'field list'
+ERROR 42S22: Unknown column 'updatable_views_with_limit' in 'SELECT'
 SET @@global.updatable_views_with_limit = @start_global_value;
 SELECT @@global.updatable_views_with_limit;
 @@global.updatable_views_with_limit
diff --git a/mysql-test/suite/sys_vars/r/version_basic.result b/mysql-test/suite/sys_vars/r/version_basic.result
index 01710426ac9..ea7817e7b36 100644
--- a/mysql-test/suite/sys_vars/r/version_basic.result
+++ b/mysql-test/suite/sys_vars/r/version_basic.result
@@ -49,5 +49,5 @@ COUNT(@@GLOBAL.version)
 1
 1 Expected
 SELECT version = @@SESSION.version;
-ERROR 42S22: Unknown column 'version' in 'field list'
+ERROR 42S22: Unknown column 'version' in 'SELECT'
 Expected error 'Readonly variable'
diff --git a/mysql-test/suite/sys_vars/r/version_comment_basic.result b/mysql-test/suite/sys_vars/r/version_comment_basic.result
index 5ef4bdbdd87..7fc910e8d95 100644
--- a/mysql-test/suite/sys_vars/r/version_comment_basic.result
+++ b/mysql-test/suite/sys_vars/r/version_comment_basic.result
@@ -49,5 +49,5 @@ COUNT(@@GLOBAL.version_comment)
 1
 1 Expected
 SELECT version_comment = @@SESSION.version_comment;
-ERROR 42S22: Unknown column 'version_comment' in 'field list'
+ERROR 42S22: Unknown column 'version_comment' in 'SELECT'
 Expected error 'Readonly variable'
diff --git a/mysql-test/suite/sys_vars/r/version_compile_machine_basic.result b/mysql-test/suite/sys_vars/r/version_compile_machine_basic.result
index eb239041929..e10df3e4098 100644
--- a/mysql-test/suite/sys_vars/r/version_compile_machine_basic.result
+++ b/mysql-test/suite/sys_vars/r/version_compile_machine_basic.result
@@ -49,5 +49,5 @@ COUNT(@@GLOBAL.version_compile_machine)
 1
 1 Expected
 SELECT version_compile_machine = @@SESSION.version_compile_machine;
-ERROR 42S22: Unknown column 'version_compile_machine' in 'field list'
+ERROR 42S22: Unknown column 'version_compile_machine' in 'SELECT'
 Expected error 'Readonly variable'
diff --git a/mysql-test/suite/sys_vars/r/version_compile_os_basic.result b/mysql-test/suite/sys_vars/r/version_compile_os_basic.result
index 64dcb761ae1..33d2dbf7fca 100644
--- a/mysql-test/suite/sys_vars/r/version_compile_os_basic.result
+++ b/mysql-test/suite/sys_vars/r/version_compile_os_basic.result
@@ -49,5 +49,5 @@ COUNT(@@GLOBAL.version_compile_os)
 1
 1 Expected
 SELECT version_compile_os = @@SESSION.version_compile_os;
-ERROR 42S22: Unknown column 'version_compile_os' in 'field list'
+ERROR 42S22: Unknown column 'version_compile_os' in 'SELECT'
 Expected error 'Readonly variable'
diff --git a/mysql-test/suite/sys_vars/r/version_malloc_library_basic.result b/mysql-test/suite/sys_vars/r/version_malloc_library_basic.result
index 5895b8122d9..6c21d989e70 100644
--- a/mysql-test/suite/sys_vars/r/version_malloc_library_basic.result
+++ b/mysql-test/suite/sys_vars/r/version_malloc_library_basic.result
@@ -49,5 +49,5 @@ COUNT(@@GLOBAL.version_malloc_library)
 1
 1 Expected
 SELECT version_malloc_library = @@SESSION.version;
-ERROR 42S22: Unknown column 'version_malloc_library' in 'field list'
+ERROR 42S22: Unknown column 'version_malloc_library' in 'SELECT'
 Expected error 'Readonly variable'
diff --git a/mysql-test/suite/sys_vars/r/wait_timeout_basic.result b/mysql-test/suite/sys_vars/r/wait_timeout_basic.result
index d0e5188b508..480db6f3d1e 100644
--- a/mysql-test/suite/sys_vars/r/wait_timeout_basic.result
+++ b/mysql-test/suite/sys_vars/r/wait_timeout_basic.result
@@ -119,11 +119,11 @@ SELECT @@wait_timeout;
 @@wait_timeout
 1027
 SELECT local.wait_timeout;
-ERROR 42S02: Unknown table 'local' in field list
+ERROR 42S02: Unknown table 'local' in SELECT
 SELECT session.wait_timeout;
-ERROR 42S02: Unknown table 'session' in field list
+ERROR 42S02: Unknown table 'session' in SELECT
 SELECT wait_timeout = @@session.wait_timeout;
-ERROR 42S22: Unknown column 'wait_timeout' in 'field list'
+ERROR 42S22: Unknown column 'wait_timeout' in 'SELECT'
 #
 # MDEV-9516 type error when setting session variable
 #
diff --git a/mysql-test/suite/sys_vars/r/warning_count_basic.result b/mysql-test/suite/sys_vars/r/warning_count_basic.result
index 0ce85c7bbf9..4266d11f7d8 100644
--- a/mysql-test/suite/sys_vars/r/warning_count_basic.result
+++ b/mysql-test/suite/sys_vars/r/warning_count_basic.result
@@ -50,5 +50,5 @@ SELECT COUNT(@@GLOBAL.warning_count);
 ERROR HY000: Variable 'warning_count' is a SESSION variable
 Expected error 'Variable is a SESSION variable'
 SELECT COUNT(warning_count = @@GLOBAL.warning_count);
-ERROR 42S22: Unknown column 'warning_count' in 'field list'
+ERROR 42S22: Unknown column 'warning_count' in 'SELECT'
 Expected error 'Readonly variable'
diff --git a/mysql-test/suite/versioning/r/update.result b/mysql-test/suite/versioning/r/update.result
index c439f5cf8f5..c7b8d922e58 100644
--- a/mysql-test/suite/versioning/r/update.result
+++ b/mysql-test/suite/versioning/r/update.result
@@ -329,9 +329,9 @@ create or replace table t1 (a int) with system versioning;
 create or replace view v1 as select * from t1;
 create or replace procedure sp() update v1 set xx = 1;
 call sp;
-ERROR 42S22: Unknown column 'xx' in 'field list'
+ERROR 42S22: Unknown column 'xx' in 'SET'
 call sp;
-ERROR 42S22: Unknown column 'xx' in 'field list'
+ERROR 42S22: Unknown column 'xx' in 'SET'
 drop procedure sp;
 drop view v1;
 drop table t1;
diff --git a/sql/set_var.cc b/sql/set_var.cc
index 15c07b969af..cbe0dd32b89 100644
--- a/sql/set_var.cc
+++ b/sql/set_var.cc
@@ -790,6 +790,7 @@ int set_var::check(THD *thd)
   if (!value)
     return 0;
 
+  thd->where= THD_WHERE::SET_LIST;
   if (value->fix_fields_if_needed_for_scalar(thd, &value))
     return -1;
   if (var->check_update_type(value))
@@ -896,6 +897,7 @@ int set_var_user::check(THD *thd)
     Item_func_set_user_var can't substitute something else on its place =>
     0 can be passed as last argument (reference on item)
   */
+  thd->where= THD_WHERE::SET_LIST;
   return (user_var_item->fix_fields(thd, (Item**) 0) ||
           user_var_item->check(0)) ? -1 : 0;
 }
diff --git a/sql/sql_base.cc b/sql/sql_base.cc
index 4c1a5796653..0ddf0740fdf 100644
--- a/sql/sql_base.cc
+++ b/sql/sql_base.cc
@@ -7704,7 +7704,7 @@ int setup_wild(THD *thd, TABLE_LIST *tables, List<Item> &fields,
 bool setup_fields(THD *thd, Ref_ptr_array ref_pointer_array,
                   List<Item> &fields, enum_column_usage column_usage,
                   List<Item> *sum_func_list, List<Item> *pre_fix,
-                  bool allow_sum_func)
+                  bool allow_sum_func, THD_WHERE where)
 {
   Item *item;
   enum_column_usage saved_column_usage= thd->column_usage;
@@ -7730,7 +7730,7 @@ bool setup_fields(THD *thd, Ref_ptr_array ref_pointer_array,
               thd->lex->current_select->nest_level);
   if (allow_sum_func)
     thd->lex->allow_sum_func.set_bit(thd->lex->current_select->nest_level);
-  thd->where= THD_WHERE::DEFAULT_WHERE;
+  thd->where= where;
   save_is_item_list_lookup= thd->lex->current_select->is_item_list_lookup;
   thd->lex->current_select->is_item_list_lookup= 0;
 
@@ -7811,7 +7811,7 @@ bool setup_fields(THD *thd, Ref_ptr_array ref_pointer_array,
   thd->lex->allow_sum_func= save_allow_sum_func;
   thd->column_usage= saved_column_usage;
   DBUG_PRINT("info", ("thd->column_usage: %d", thd->column_usage));
-  DBUG_RETURN(MY_TEST(thd->is_error()));
+  DBUG_RETURN(thd->is_error());
 }
 
 /*
@@ -7864,7 +7864,7 @@ int setup_returning_fields(THD* thd, TABLE_LIST* table_list)
   return setup_wild(thd, table_list, thd->lex->returning()->item_list, NULL,
                     thd->lex->returning(), true)
       || setup_fields(thd, Ref_ptr_array(), thd->lex->returning()->item_list,
-                      MARK_COLUMNS_READ, NULL, NULL, false);
+                      MARK_COLUMNS_READ, NULL, NULL, 0, THD_WHERE::RETURNING);
 }
 
 
diff --git a/sql/sql_base.h b/sql/sql_base.h
index 26b0f1b709b..476c7517f56 100644
--- a/sql/sql_base.h
+++ b/sql/sql_base.h
@@ -188,7 +188,7 @@ int setup_returning_fields(THD* thd, TABLE_LIST* table_list);
 bool setup_fields(THD *thd, Ref_ptr_array ref_pointer_array,
                   List<Item> &item, enum_column_usage column_usage,
                   List<Item> *sum_func_list, List<Item> *pre_fix,
-                  bool allow_sum_func);
+                  bool allow_sum_func, THD_WHERE where= THD_WHERE::DEFAULT_WHERE);
 void unfix_fields(List<Item> &items);
 bool fill_record(THD * thd, TABLE *table_arg, List<Item> &fields,
                  List<Item> &values, bool ignore_errors, bool update);
@@ -378,14 +378,15 @@ inline bool setup_fields_with_no_wrap(THD *thd, Ref_ptr_array ref_pointer_array,
                                       List<Item> &item,
                                       enum_column_usage column_usage,
                                       List<Item> *sum_func_list,
-                                      bool allow_sum_func)
+                                      bool allow_sum_func,
+                                      THD_WHERE where= THD_WHERE::DEFAULT_WHERE)
 {
   bool res;
   SELECT_LEX *first= thd->lex->first_select_lex();
   DBUG_ASSERT(thd->lex->current_select == first);
   first->no_wrap_view_item= TRUE;
   res= setup_fields(thd, ref_pointer_array, item, column_usage,
-                    sum_func_list, NULL,  allow_sum_func);
+                    sum_func_list, NULL,  allow_sum_func, where);
   first->no_wrap_view_item= FALSE;
   return res;
 }
diff --git a/sql/sql_class.cc b/sql/sql_class.cc
index 6e1743e78f8..0dfda3bfa68 100644
--- a/sql/sql_class.cc
+++ b/sql/sql_class.cc
@@ -631,51 +631,47 @@ const char *thd_where(THD *thd)
 {
     switch(thd->where) {
     case THD_WHERE::CHECKING_TRANSFORMED_SUBQUERY:
-        return "checking transformed subquery";
-        break;
     case THD_WHERE::IN_ALL_ANY_SUBQUERY:
-        return "IN/ALL/ANY subquery";
-        break;
+        return "IN/ALL/ANY";
     case THD_WHERE::JSON_TABLE_ARGUMENT:
-        return "JSON_TABLE argument";
-        break;
-    case THD_WHERE::DEFAULT_WHERE:  // same as FIELD_LIST
+        return "JSON_TABLE";
+    case THD_WHERE::DEFAULT_WHERE:
+        return "SELECT";
     case THD_WHERE::FIELD_LIST:
-        return "field list";
-        break;
     case THD_WHERE::PARTITION_FUNCTION:
-        return "partition function";
-        break;
+        return "PARTITION BY";
     case THD_WHERE::FROM_CLAUSE:
-        return "from clause";
-        break;
+        return "FROM";
     case THD_WHERE::ON_CLAUSE:
-        return "on clause";
-        break;
+        return "ON";
     case THD_WHERE::WHERE_CLAUSE:
-        return "where clause";
-        break;
-    case THD_WHERE::CONVERT_CHARSET_CONST:
-        return "convert character set partition constant";
-        break;
+        return "WHERE";
+    case THD_WHERE::SET_LIST:
+        return "SET";
+    case THD_WHERE::INSERT_LIST:
+        return "INSERT INTO";
+    case THD_WHERE::RETURNING:
+        return "RETURNING";
+    case THD_WHERE::UPDATE_CLAUSE:
+        return "UPDATE";
+    case THD_WHERE::VALUES_CLAUSE:
+        return "VALUES";
     case THD_WHERE::FOR_SYSTEM_TIME:
         return "FOR SYSTEM_TIME";
-        break;
     case THD_WHERE::ORDER_CLAUSE:
-        return "order clause";
-        break;
+        return "ORDER BY";
     case THD_WHERE::HAVING_CLAUSE:
-        return "having clause";
-        break;
+        return "HAVING";
     case THD_WHERE::GROUP_STATEMENT:
-        return "group statement";
-        break;
+        return "GROUP BY";
     case THD_WHERE::PROCEDURE_LIST:
-        return "procedure list";
-        break;
+        return "PROCEDURE";
     case THD_WHERE::CHECK_OPTION:
-        return "check option";
-        break;
+        return "CHECK OPTION";
+    case THD_WHERE::DO_STATEMENT:
+        return "DO";
+    case THD_WHERE::HANDLER_STATEMENT:
+        return "HANDLER ... READ";
     case THD_WHERE::USE_WHERE_STRING:
         return thd->where_str;
     default:
diff --git a/sql/sql_class.h b/sql/sql_class.h
index 1aab0a58d1d..1878385383f 100644
--- a/sql/sql_class.h
+++ b/sql/sql_class.h
@@ -2682,13 +2682,19 @@ enum class THD_WHERE
   DEFAULT_WHERE,
   ON_CLAUSE,
   WHERE_CLAUSE,
-  CONVERT_CHARSET_CONST,
+  SET_LIST,
+  INSERT_LIST,
+  VALUES_CLAUSE,
+  UPDATE_CLAUSE,
+  RETURNING,
   FOR_SYSTEM_TIME,
   ORDER_CLAUSE,
   HAVING_CLAUSE,
   GROUP_STATEMENT,
   PROCEDURE_LIST,
   CHECK_OPTION,
+  DO_STATEMENT,
+  HANDLER_STATEMENT,
   USE_WHERE_STRING, // ugh, a compromise for vcol...
 };
 
diff --git a/sql/sql_do.cc b/sql/sql_do.cc
index 5a7bca2774c..0e5b40dec11 100644
--- a/sql/sql_do.cc
+++ b/sql/sql_do.cc
@@ -29,7 +29,8 @@ bool mysql_do(THD *thd, List<Item> &values)
   List_iterator<Item> li(values);
   Item *value;
   DBUG_ENTER("mysql_do");
-  if (setup_fields(thd, Ref_ptr_array(), values, COLUMNS_READ, 0, NULL, 0))
+  if (setup_fields(thd, Ref_ptr_array(), values, COLUMNS_READ, 0, NULL, 0,
+                   THD_WHERE::DO_STATEMENT))
     DBUG_RETURN(TRUE);
   while ((value = li++))
     (void) value->is_null();
diff --git a/sql/sql_handler.cc b/sql/sql_handler.cc
index 086aaf3e69f..72c2c7b5ee3 100644
--- a/sql/sql_handler.cc
+++ b/sql/sql_handler.cc
@@ -638,6 +638,7 @@ mysql_ha_fix_cond_and_key(SQL_HANDLER *handler,
                "WHERE", "HANDLER");
       return 1;                                 // ROWNUM() used
     }
+    thd->where= THD_WHERE::WHERE_CLAUSE;
     if (cond->fix_fields_if_needed_for_bool(thd, &cond))
       return 1;
   }
@@ -696,6 +697,7 @@ mysql_ha_fix_cond_and_key(SQL_HANDLER *handler,
         return 1;
       }
 
+      thd->where= THD_WHERE::HANDLER_STATEMENT;
       for (keypart_map= key_len=0 ; (item=it_ke++) ; key_part++)
       {
 	/* note that 'item' can be changed by fix_fields() call */
diff --git a/sql/sql_insert.cc b/sql/sql_insert.cc
index 4aefa572c1c..a07df381075 100644
--- a/sql/sql_insert.cc
+++ b/sql/sql_insert.cc
@@ -276,7 +276,8 @@ static int check_insert_fields(THD *thd, TABLE_LIST *table_list,
       unfix_fields(fields);
 
     res= setup_fields(thd, Ref_ptr_array(),
-                      fields, MARK_COLUMNS_WRITE, 0, NULL, 0);
+                      fields, MARK_COLUMNS_WRITE, 0, NULL, 0,
+                      THD_WHERE::INSERT_LIST);
 
     /* Restore the current context. */
     ctx_state.restore_state(context, table_list);
@@ -387,8 +388,8 @@ static int check_update_fields(THD *thd, TABLE_LIST *insert_table_list,
   }
 
   /* Check the fields we are going to modify */
-  if (setup_fields(thd, Ref_ptr_array(),
-                   update_fields, MARK_COLUMNS_WRITE, 0, NULL, 0))
+  if (setup_fields(thd, Ref_ptr_array(), update_fields, MARK_COLUMNS_WRITE, 0,
+                   NULL, 0, THD_WHERE::UPDATE_CLAUSE))
     return -1;
 
   if (insert_table_list->is_view() &&
@@ -1711,8 +1712,8 @@ int mysql_prepare_insert(THD *thd, TABLE_LIST *table_list,
     context->resolve_in_table_list_only(table_list);
 
     res= setup_returning_fields(thd, table_list) ||
-         setup_fields(thd, Ref_ptr_array(),
-                      *values, MARK_COLUMNS_READ, 0, NULL, 0) ||
+         setup_fields(thd, Ref_ptr_array(), *values, MARK_COLUMNS_READ, 0,
+                      NULL, 0, THD_WHERE::VALUES_CLAUSE) ||
           check_insert_fields(thd, context->table_list, fields, *values,
                               !insert_into_view, 0, &map);
 
@@ -4016,7 +4017,7 @@ select_insert::prepare(List<Item> &values, SELECT_LEX_UNIT *u)
     }
 
     res= res || setup_fields(thd, Ref_ptr_array(), *info.update_values,
-                             MARK_COLUMNS_READ, 0, NULL, 0);
+                      MARK_COLUMNS_READ, 0, NULL, 0, THD_WHERE::UPDATE_CLAUSE);
     if (!res)
     {
       /*
diff --git a/sql/sql_partition.cc b/sql/sql_partition.cc
index 1006c18ae11..2fc5467f15d 100644
--- a/sql/sql_partition.cc
+++ b/sql/sql_partition.cc
@@ -146,7 +146,7 @@ Item* convert_charset_partition_constant(Item *item, CHARSET_INFO *cs)
 
   item= item->safe_charset_converter(thd, cs);
   context->table_list= NULL;
-  thd->where= THD_WHERE::CONVERT_CHARSET_CONST;
+  thd->where= THD_WHERE::VALUES_CLAUSE;
   if (item && item->fix_fields_if_needed(thd, (Item**)NULL))
     item= NULL;
   thd->where= save_where;
diff --git a/sql/sql_prepare.cc b/sql/sql_prepare.cc
index 366aa6fcd25..9ea89670625 100644
--- a/sql/sql_prepare.cc
+++ b/sql/sql_prepare.cc
@@ -1488,8 +1488,8 @@ static int mysql_test_update(Prepared_statement *stmt,
   table_list->register_want_access(want_privilege);
 #endif
   thd->lex->first_select_lex()->no_wrap_view_item= TRUE;
-  res= setup_fields(thd, Ref_ptr_array(),
-                    select->item_list, MARK_COLUMNS_READ, 0, NULL, 0);
+  res= setup_fields(thd, Ref_ptr_array(), select->item_list, MARK_COLUMNS_READ,
+                    0, NULL, 0, THD_WHERE::SET_LIST);
   thd->lex->first_select_lex()->no_wrap_view_item= FALSE;
   if (res)
     goto error;
@@ -1500,8 +1500,8 @@ static int mysql_test_update(Prepared_statement *stmt,
     (SELECT_ACL & ~table_list->table->grant.privilege);
   table_list->register_want_access(SELECT_ACL);
 #endif
-  if (setup_fields(thd, Ref_ptr_array(),
-                   stmt->lex->value_list, COLUMNS_READ, 0, NULL, 0) ||
+  if (setup_fields(thd, Ref_ptr_array(), stmt->lex->value_list, COLUMNS_READ,
+                   0, NULL, 0, THD_WHERE::SET_LIST) ||
       check_unique_table(thd, table_list))
     goto error;
   /* TODO: here we should send types of placeholders to the client. */
@@ -1676,8 +1676,8 @@ static bool mysql_test_do_fields(Prepared_statement *stmt,
   if (open_normal_and_derived_tables(thd, tables, MYSQL_OPEN_FORCE_SHARED_MDL,
                                      DT_INIT | DT_PREPARE))
     DBUG_RETURN(TRUE);
-  DBUG_RETURN(setup_fields(thd, Ref_ptr_array(),
-                           *values, COLUMNS_READ, 0, NULL, 0));
+  DBUG_RETURN(setup_fields(thd, Ref_ptr_array(), *values, COLUMNS_READ, 0,
+                           NULL, 0, THD_WHERE::DO_STATEMENT));
 }
 
 
@@ -1709,6 +1709,7 @@ static bool mysql_test_set_fields(Prepared_statement *stmt,
                                      DT_INIT | DT_PREPARE))
     goto error;
 
+  thd->where= THD_WHERE::SET_LIST;
   while ((var= it++))
   {
     if (var->light_check(thd))
diff --git a/sql/sql_update.cc b/sql/sql_update.cc
index 4e6c580be21..2103961f068 100644
--- a/sql/sql_update.cc
+++ b/sql/sql_update.cc
@@ -500,8 +500,9 @@ int mysql_update(THD *thd,
   if (table_list->is_view())
     unfix_fields(fields);
 
-  if (setup_fields_with_no_wrap(thd, Ref_ptr_array(),
-                                fields, MARK_COLUMNS_WRITE, 0, 0))
+  ;
+  if (setup_fields_with_no_wrap(thd, Ref_ptr_array(), fields,
+                                MARK_COLUMNS_WRITE, 0, 0, THD_WHERE::SET_LIST))
     DBUG_RETURN(1);                     /* purecov: inspected */
   if (check_fields(thd, table_list, fields, table_list->view))
   {
@@ -522,7 +523,8 @@ int mysql_update(THD *thd,
   table_list->grant.want_privilege= table->grant.want_privilege=
     (SELECT_ACL & ~table->grant.privilege);
 #endif
-  if (setup_fields(thd, Ref_ptr_array(), values, MARK_COLUMNS_READ, 0, NULL, 0))
+  if (setup_fields(thd, Ref_ptr_array(), values, MARK_COLUMNS_READ, 0, NULL, 0,
+                   THD_WHERE::SET_LIST))
   {
     free_underlaid_joins(thd, select_lex);
     DBUG_RETURN(1);				/* purecov: inspected */
@@ -1774,8 +1776,8 @@ bool Multiupdate_prelocking_strategy::handle_end(THD *thd)
     DBUG_RETURN(1);
 
   List<Item> *fields= &lex->first_select_lex()->item_list;
-  if (setup_fields_with_no_wrap(thd, Ref_ptr_array(),
-                                *fields, MARK_COLUMNS_WRITE, 0, 0))
+  if (setup_fields_with_no_wrap(thd, Ref_ptr_array(), *fields,
+                                MARK_COLUMNS_WRITE, 0, 0, THD_WHERE::SET_LIST))
     DBUG_RETURN(1);
 
   // Check if we have a view in the list ...
diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy
index 67a702f8969..471ce8f8eb9 100644
--- a/sql/sql_yacc.yy
+++ b/sql/sql_yacc.yy
@@ -2089,7 +2089,11 @@ deallocate_or_drop:
 
 prepare:
           PREPARE_SYM ident FROM
-          { Lex->clause_that_disallows_subselect= "PREPARE..FROM"; }
+          {
+            thd->where= THD_WHERE::USE_WHERE_STRING;
+            thd->where_str=
+            Lex->clause_that_disallows_subselect= "PREPARE..FROM";
+          }
           expr
           {
             Lex->clause_that_disallows_subselect= NULL;
@@ -2105,7 +2109,11 @@ execute:
               MYSQL_YYABORT;
           }
         | EXECUTE_SYM IMMEDIATE_SYM
-          { Lex->clause_that_disallows_subselect= "EXECUTE IMMEDIATE"; }
+          {
+            thd->where= THD_WHERE::USE_WHERE_STRING;
+            thd->where_str=
+            Lex->clause_that_disallows_subselect= "EXECUTE IMMEDIATE";
+          }
           expr
           { Lex->clause_that_disallows_subselect= NULL; }
           execute_using
@@ -3100,7 +3108,11 @@ call:
 /* CALL parameters */
 opt_sp_cparam_list:
           /* Empty */
-        | '(' opt_sp_cparams ')'
+        | '('
+        {
+          thd->where= THD_WHERE::USE_WHERE_STRING;
+          thd->where_str= "CALL";
+        } opt_sp_cparams ')'
         ;
 
 opt_sp_cparams:
@@ -3574,9 +3586,14 @@ resignal_stmt:
         ;
 
 get_diagnostics:
-          GET_SYM which_area DIAGNOSTICS_SYM diagnostics_information
+          GET_SYM which_area DIAGNOSTICS_SYM
           {
-            Diagnostics_information *info= $4;
+            thd->where= THD_WHERE::USE_WHERE_STRING;
+            thd->where_str= "GET DIAGNOSTICS";
+          }
+          diagnostics_information
+          {
+            Diagnostics_information *info= $5;
 
             info->set_which_da($2);
 
@@ -14736,6 +14753,8 @@ kill:
             lex->users_list.empty();
             lex->sql_command= SQLCOM_KILL;
             lex->kill_type= KILL_TYPE_ID;
+            thd->where= THD_WHERE::USE_WHERE_STRING;
+            thd->where_str= "KILL";
           }
           kill_type kill_option
           {
diff --git a/storage/connect/mysql-test/connect/r/mysql.result b/storage/connect/mysql-test/connect/r/mysql.result
index 6e61fe3f4d7..508c2fcfdf5 100644
--- a/storage/connect/mysql-test/connect/r/mysql.result
+++ b/storage/connect/mysql-test/connect/r/mysql.result
@@ -28,7 +28,7 @@ t2	CREATE TABLE `t2` (
   `y` char(10) DEFAULT NULL
 ) ENGINE=CONNECT DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci `TABLE_TYPE`=MYSQL `TABNAME`='t1' `OPTION_LIST`='host=localhost,user=root,port=PORT'
 SELECT * FROM t2;
-ERROR HY000: Got error 174 '(1054) Unknown column 'x' in 'field list' [SELECT `x`, `y` FROM `t1`]' from CONNECT
+ERROR HY000: Got error 174 '(1054) Unknown column 'x' in 'SELECT' [SELECT `x`, `y` FROM `t1`]' from CONNECT
 DROP TABLE t2;
 CREATE TABLE t2 (a int, b char(10)) ENGINE=CONNECT TABLE_TYPE=MYSQL TABNAME='t1' OPTION_LIST='host=localhost,user=root,port=PORT';
 ALTER TABLE t1 RENAME t1backup;
diff --git a/storage/connect/mysql-test/connect/r/mysql_exec.result b/storage/connect/mysql-test/connect/r/mysql_exec.result
index cc77240503b..79f7d6f0a3f 100644
--- a/storage/connect/mysql-test/connect/r/mysql_exec.result
+++ b/storage/connect/mysql-test/connect/r/mysql_exec.result
@@ -30,7 +30,7 @@ create table t1 (id int key auto_increment, msg varchar(32) not null)	0	0	Affect
 insert into t1(msg) values('One'),(NULL),('Three')	1	3	Affected rows
 Warning	0	1048	Column 'msg' cannot be null
 insert into t1 values(2,'Deux') on duplicate key update msg = 'Two'	0	2	Affected rows
-insert into t1(message) values('Four'),('Five'),('Six')	0	1054	Remote: Unknown column 'message' in 'field list'
+insert into t1(message) values('Four'),('Five'),('Six')	0	1054	Remote: Unknown column 'message' in 'INSERT INTO'
 insert ignore into t1(id) values(NULL)	1	1	Affected rows
 Warning	0	1364	Field 'msg' doesn't have a default value
 update t1 set msg = 'Four' where id = 4	0	1	Affected rows
diff --git a/storage/connect/mysql-test/connect/r/mysql_new.result b/storage/connect/mysql-test/connect/r/mysql_new.result
index 4d4006eea2c..d42d868fab0 100644
--- a/storage/connect/mysql-test/connect/r/mysql_new.result
+++ b/storage/connect/mysql-test/connect/r/mysql_new.result
@@ -41,7 +41,7 @@ t1	CREATE TABLE `t1` (
   `y` char(10) DEFAULT NULL
 ) ENGINE=CONNECT DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci CONNECTION='mysql://root@127.0.0.1:SLAVE_PORT/test/t1' `TABLE_TYPE`=MYSQL
 SELECT * FROM t1;
-ERROR HY000: Got error 174 '(1054) Unknown column 'x' in 'field list' [SELECT `x`, `y` FROM `t1`]' from CONNECT
+ERROR HY000: Got error 174 '(1054) Unknown column 'x' in 'SELECT' [SELECT `x`, `y` FROM `t1`]' from CONNECT
 DROP TABLE t1;
 CREATE TABLE t1 (a int, b char(10)) ENGINE=CONNECT TABLE_TYPE=MYSQL
 CONNECTION='mysql://root@127.0.0.1:SLAVE_PORT/test/t1';
diff --git a/storage/spider/mysql-test/spider/bugfix/r/mdev_26582.result b/storage/spider/mysql-test/spider/bugfix/r/mdev_26582.result
index 54a4fc44b48..3928b211cbc 100644
--- a/storage/spider/mysql-test/spider/bugfix/r/mdev_26582.result
+++ b/storage/spider/mysql-test/spider/bugfix/r/mdev_26582.result
@@ -7,5 +7,5 @@ CREATE TABLE t (i CHAR) ENGINE=SPIDER;
 INSERT INTO t VALUES (0);
 ERROR HY000: Unable to connect to foreign data source: localhost
 INSERT t SELECT 1 ON DUPLICATE KEY UPDATE c=1;
-ERROR 42S22: Unknown column 'c' in 'field list'
+ERROR 42S22: Unknown column 'c' in 'UPDATE'
 DROP DATABASE IF EXISTS auto_test_local;
diff --git a/storage/spider/mysql-test/spider/bugfix/r/mdev_27240.result b/storage/spider/mysql-test/spider/bugfix/r/mdev_27240.result
index 9dd247337ee..f277008751f 100644
--- a/storage/spider/mysql-test/spider/bugfix/r/mdev_27240.result
+++ b/storage/spider/mysql-test/spider/bugfix/r/mdev_27240.result
@@ -5,7 +5,7 @@ CREATE DATABASE auto_test_local;
 USE auto_test_local;
 CREATE TABLE tbl_a (a INT KEY) ENGINE=SPIDER;
 SELECT a.z FROM tbl_a AS a,tbl_a b WHERE a.z=b.z;
-ERROR 42S22: Unknown column 'a.z' in 'field list'
+ERROR 42S22: Unknown column 'a.z' in 'SELECT'
 ALTER TABLE tbl_a CHANGE c c INT;
 ERROR 42S22: Unknown column 'c' in 'tbl_a'
 LOCK TABLE tbl_a READ;
diff --git a/storage/spider/mysql-test/spider/bugfix/r/mdev_34541.result b/storage/spider/mysql-test/spider/bugfix/r/mdev_34541.result
index acc1528efc4..50ff0287558 100644
--- a/storage/spider/mysql-test/spider/bugfix/r/mdev_34541.result
+++ b/storage/spider/mysql-test/spider/bugfix/r/mdev_34541.result
@@ -24,7 +24,7 @@ CALL foo;
 ERROR 42000: PROCEDURE test.foo does not exist
 CREATE TEMPORARY TABLE t7 (c INT) ENGINE=InnoDB;
 SELECT * FROM t7 JOIN t6 ON tc=t0.c;
-ERROR 42S22: Unknown column 'tc' in 'on clause'
+ERROR 42S22: Unknown column 'tc' in 'ON'
 SHOW TABLE STATUS;
 drop table ta, t8, t7, t6, t5, t3, t2, t1;
 drop table t7;