MDEV-34679 ER_BAD_FIELD uses non-localizable substrings

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

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;

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;

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);

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'

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;

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

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;

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;

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:

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));

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));

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));

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));

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),

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;

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;

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;

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

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"

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

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

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;

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 ';

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

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;

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;

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

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'

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

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

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

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

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'

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

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'

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;

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

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;

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

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;

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;

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;

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;

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;

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'

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;

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;

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;

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

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

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

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'

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

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;

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;

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

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

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

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

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

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'

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

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;

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

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

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;

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

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

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'

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'

mysql-test/suite/sys_vars/r/have_csv_basic.result

@@ -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'

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'

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'

mysql-test/suite/sys_vars/r/have_innodb_basic.result

@@ -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'

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'

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'

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'

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'

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'

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'

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

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-------------------------#'

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

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'

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'

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

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'

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

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

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

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'

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'

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'

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'

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

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'

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