MDEV-34679 ER_BAD_FIELD uses non-localizable substrings

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

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

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

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'

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

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'

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;

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'

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'

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'

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

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

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

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'

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'

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

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

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'

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

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

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'

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'

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

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'

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'

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

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

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;

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