diff --git a/mysql-test/suite/sys_vars/r/automatic_sp_privileges_basic.result b/mysql-test/suite/sys_vars/r/automatic_sp_privileges_basic.result index 98072169fc9..760cca25497 100644 --- a/mysql-test/suite/sys_vars/r/automatic_sp_privileges_basic.result +++ b/mysql-test/suite/sys_vars/r/automatic_sp_privileges_basic.result @@ -84,12 +84,8 @@ SELECT @@automatic_sp_privileges = @@global.automatic_sp_privileges; '#---------------------FN_DYNVARS_004_10----------------------#' SET automatic_sp_privileges = 1; ERROR HY000: Variable 'automatic_sp_privileges' is a GLOBAL variable and should be set with SET GLOBAL -SET local.automatic_sp_privileges = 1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'automatic_sp_privileges = 1' at line 1 SELECT local.automatic_sp_privileges; ERROR 42S02: Unknown table 'local' in field list -SET global.automatic_sp_privileges = 1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'automatic_sp_privileges = 1' at line 1 SELECT global.automatic_sp_privileges; ERROR 42S02: Unknown table 'global' in field list SELECT automatic_sp_privileges = @@session.automatic_sp_privileges; diff --git a/mysql-test/suite/sys_vars/r/big_tables_basic.result b/mysql-test/suite/sys_vars/r/big_tables_basic.result index 4ff5774812a..29781987d47 100644 --- a/mysql-test/suite/sys_vars/r/big_tables_basic.result +++ b/mysql-test/suite/sys_vars/r/big_tables_basic.result @@ -86,12 +86,8 @@ SET big_tables = 1; SELECT @@big_tables; @@big_tables 1 -SET local.big_tables = 1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'big_tables = 1' at line 1 SELECT local.big_tables; ERROR 42S02: Unknown table 'local' in field list -SET session.big_tables = 1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'big_tables = 1' at line 1 SELECT session.big_tables; ERROR 42S02: Unknown table 'session' in field list select big_tables; diff --git a/mysql-test/suite/sys_vars/r/binlog_cache_size_basic.result b/mysql-test/suite/sys_vars/r/binlog_cache_size_basic.result index d83caffb5be..680e62162a7 100644 --- a/mysql-test/suite/sys_vars/r/binlog_cache_size_basic.result +++ b/mysql-test/suite/sys_vars/r/binlog_cache_size_basic.result @@ -96,8 +96,6 @@ SELECT @@binlog_cache_size = @@global.binlog_cache_size; '#---------------------FN_DYNVARS_006_09----------------------#' SET binlog_cache_size = 1; ERROR HY000: Variable 'binlog_cache_size' is a GLOBAL variable and should be set with SET GLOBAL -SET global.binlog_cache_size = 1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'binlog_cache_size = 1' at line 1 SELECT global.binlog_cache_size; ERROR 42S02: Unknown table 'global' in field list SELECT binlog_cache_size = @@session.binlog_cache_size; diff --git a/mysql-test/suite/sys_vars/r/binlog_stmt_cache_size_basic.result b/mysql-test/suite/sys_vars/r/binlog_stmt_cache_size_basic.result index 94519d3cd23..f16a36eefa4 100644 --- a/mysql-test/suite/sys_vars/r/binlog_stmt_cache_size_basic.result +++ b/mysql-test/suite/sys_vars/r/binlog_stmt_cache_size_basic.result @@ -96,8 +96,6 @@ SELECT @@binlog_stmt_cache_size = @@global.binlog_stmt_cache_size; '#---------------------FN_DYNVARS_006_09----------------------#' SET binlog_stmt_cache_size = 1; ERROR HY000: Variable 'binlog_stmt_cache_size' is a GLOBAL variable and should be set with SET GLOBAL -SET global.binlog_stmt_cache_size = 1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'binlog_stmt_cache_size = 1' at line 1 SELECT global.binlog_stmt_cache_size; ERROR 42S02: Unknown table 'global' in field list SELECT binlog_stmt_cache_size = @@session.binlog_stmt_cache_size; diff --git a/mysql-test/suite/sys_vars/r/bulk_insert_buffer_size_basic.result b/mysql-test/suite/sys_vars/r/bulk_insert_buffer_size_basic.result index 1b8e000ad81..97083da7033 100644 --- a/mysql-test/suite/sys_vars/r/bulk_insert_buffer_size_basic.result +++ b/mysql-test/suite/sys_vars/r/bulk_insert_buffer_size_basic.result @@ -133,12 +133,8 @@ SET bulk_insert_buffer_size = 1; SELECT @@bulk_insert_buffer_size; @@bulk_insert_buffer_size 1 -SET local.bulk_insert_buffer_size = 1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'bulk_insert_buffer_size = 1' at line 1 SELECT local.bulk_insert_buffer_size; ERROR 42S02: Unknown table 'local' in field list -SET session.bulk_insert_buffer_size = 1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'bulk_insert_buffer_size = 1' at line 1 SELECT session.bulk_insert_buffer_size; ERROR 42S02: Unknown table 'session' in field list SELECT bulk_insert_buffer_size = @@session.bulk_insert_buffer_size; diff --git a/mysql-test/suite/sys_vars/r/character_set_client_basic.result b/mysql-test/suite/sys_vars/r/character_set_client_basic.result index e6502d63c78..749e669dd26 100644 --- a/mysql-test/suite/sys_vars/r/character_set_client_basic.result +++ b/mysql-test/suite/sys_vars/r/character_set_client_basic.result @@ -21,8 +21,6 @@ SET character_set_client=utf8; SELECT @@session.character_set_client; @@session.character_set_client utf8 -SET global.character_set_client=utf8; -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 'character_set_client=utf8' at line 1 SET session character_set_client=utf8; SELECT session character_set_client; ERROR 42S22: Unknown column 'session' in 'field list' diff --git a/mysql-test/suite/sys_vars/r/character_set_connection_basic.result b/mysql-test/suite/sys_vars/r/character_set_connection_basic.result index ad9e9c80902..ee550ee105f 100644 --- a/mysql-test/suite/sys_vars/r/character_set_connection_basic.result +++ b/mysql-test/suite/sys_vars/r/character_set_connection_basic.result @@ -21,8 +21,6 @@ SET character_set_connection=utf8; SELECT @@session.character_set_connection; @@session.character_set_connection utf8 -SET global.character_set_connection=utf8; -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 'character_set_connection=utf8' at line 1 SET session character_set_connection=utf8; SELECT session character_set_connection; ERROR 42S22: Unknown column 'session' in 'field list' diff --git a/mysql-test/suite/sys_vars/r/character_set_database_basic.result b/mysql-test/suite/sys_vars/r/character_set_database_basic.result index 2fec211cf8d..4ced9231560 100644 --- a/mysql-test/suite/sys_vars/r/character_set_database_basic.result +++ b/mysql-test/suite/sys_vars/r/character_set_database_basic.result @@ -21,8 +21,6 @@ SET character_set_database=utf8; SELECT @@session.character_set_database; @@session.character_set_database utf8 -SET global.character_set_database=utf8; -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 'character_set_database=utf8' at line 1 SET session character_set_database=utf8; SELECT session character_set_database; ERROR 42S22: Unknown column 'session' in 'field list' diff --git a/mysql-test/suite/sys_vars/r/character_set_filesystem_basic.result b/mysql-test/suite/sys_vars/r/character_set_filesystem_basic.result index c1a77b73fb3..7a32f92deeb 100644 --- a/mysql-test/suite/sys_vars/r/character_set_filesystem_basic.result +++ b/mysql-test/suite/sys_vars/r/character_set_filesystem_basic.result @@ -21,8 +21,6 @@ SET character_set_filesystem=utf8; SELECT @@session.character_set_filesystem; @@session.character_set_filesystem utf8 -SET global.character_set_filesystem=utf8; -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 'character_set_filesystem=utf8' at line 1 SET session character_set_filesystem=utf8; SELECT session character_set_filesystem; ERROR 42S22: Unknown column 'session' in 'field list' diff --git a/mysql-test/suite/sys_vars/r/character_set_results_basic.result b/mysql-test/suite/sys_vars/r/character_set_results_basic.result index 244fa4670b8..7fc498fa735 100644 Binary files a/mysql-test/suite/sys_vars/r/character_set_results_basic.result and b/mysql-test/suite/sys_vars/r/character_set_results_basic.result differ diff --git a/mysql-test/suite/sys_vars/r/character_set_server_basic.result b/mysql-test/suite/sys_vars/r/character_set_server_basic.result index 0a009cdebdb..84f6819aae2 100644 --- a/mysql-test/suite/sys_vars/r/character_set_server_basic.result +++ b/mysql-test/suite/sys_vars/r/character_set_server_basic.result @@ -21,8 +21,6 @@ SET character_set_server=utf8; SELECT @@session.character_set_server; @@session.character_set_server utf8 -SET global.character_set_server=utf8; -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 'character_set_server=utf8' at line 1 SET session character_set_server=utf8; SELECT session character_set_server; ERROR 42S22: Unknown column 'session' in 'field list' diff --git a/mysql-test/suite/sys_vars/r/collation_connection_basic.result b/mysql-test/suite/sys_vars/r/collation_connection_basic.result index 5f8d64e8fa3..eeab4885790 100644 --- a/mysql-test/suite/sys_vars/r/collation_connection_basic.result +++ b/mysql-test/suite/sys_vars/r/collation_connection_basic.result @@ -21,8 +21,6 @@ SET collation_connection=utf8_unicode_ci; SELECT @@session.collation_connection; @@session.collation_connection utf8_unicode_ci -SET global.collation_connection=utf8_unicode_ci; -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 'collation_connection=utf8_unicode_ci' at line 1 SET session collation_connection=utf8_unicode_ci; SELECT session collation_connection; ERROR 42S22: Unknown column 'session' in 'field list' diff --git a/mysql-test/suite/sys_vars/r/collation_database_basic.result b/mysql-test/suite/sys_vars/r/collation_database_basic.result index 5a218167bdb..b99a5ac29df 100644 --- a/mysql-test/suite/sys_vars/r/collation_database_basic.result +++ b/mysql-test/suite/sys_vars/r/collation_database_basic.result @@ -21,8 +21,6 @@ SET collation_database=utf8_unicode_ci; SELECT @@session.collation_database; @@session.collation_database utf8_unicode_ci -SET global.collation_database=utf8_unicode_ci; -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 'collation_database=utf8_unicode_ci' at line 1 SET session collation_database=utf8_unicode_ci; SELECT session collation_database; ERROR 42S22: Unknown column 'session' in 'field list' diff --git a/mysql-test/suite/sys_vars/r/collation_server_basic.result b/mysql-test/suite/sys_vars/r/collation_server_basic.result index 352aeb9ce15..ffe5218f21c 100644 --- a/mysql-test/suite/sys_vars/r/collation_server_basic.result +++ b/mysql-test/suite/sys_vars/r/collation_server_basic.result @@ -21,8 +21,6 @@ SET collation_server=utf8_unicode_ci; SELECT @@session.collation_server; @@session.collation_server utf8_unicode_ci -SET global.collation_server=utf8_unicode_ci; -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 'collation_server=utf8_unicode_ci' at line 1 SET session collation_server=utf8_unicode_ci; SELECT session collation_server; ERROR 42S22: Unknown column 'session' in 'field list' diff --git a/mysql-test/suite/sys_vars/r/completion_type_basic.result b/mysql-test/suite/sys_vars/r/completion_type_basic.result index 9470a7e6100..7f468121219 100644 --- a/mysql-test/suite/sys_vars/r/completion_type_basic.result +++ b/mysql-test/suite/sys_vars/r/completion_type_basic.result @@ -118,12 +118,8 @@ SET completion_type = 1; SELECT @@completion_type; @@completion_type CHAIN -SET local.completion_type = 1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'completion_type = 1' at line 1 SELECT local.completion_type; ERROR 42S02: Unknown table 'local' in field list -SET session.completion_type = 1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'completion_type = 1' at line 1 SELECT session.completion_type; ERROR 42S02: Unknown table 'session' in field list SELECT completion_type = @@session.completion_type; diff --git a/mysql-test/suite/sys_vars/r/concurrent_insert_basic.result b/mysql-test/suite/sys_vars/r/concurrent_insert_basic.result index af3d25ff58e..92e6a167c01 100644 --- a/mysql-test/suite/sys_vars/r/concurrent_insert_basic.result +++ b/mysql-test/suite/sys_vars/r/concurrent_insert_basic.result @@ -101,8 +101,6 @@ ERROR HY000: Variable 'concurrent_insert' is a GLOBAL variable and should be set SELECT @@concurrent_insert; @@concurrent_insert AUTO -SET global.concurrent_insert = 1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'concurrent_insert = 1' at line 1 SELECT global.concurrent_insert; ERROR 42S02: Unknown table 'global' in field list SELECT concurrent_insert = @@session.concurrent_insert; diff --git a/mysql-test/suite/sys_vars/r/connect_timeout_basic.result b/mysql-test/suite/sys_vars/r/connect_timeout_basic.result index 985ca925491..d0a6a650e21 100644 --- a/mysql-test/suite/sys_vars/r/connect_timeout_basic.result +++ b/mysql-test/suite/sys_vars/r/connect_timeout_basic.result @@ -81,8 +81,6 @@ SELECT @@connect_timeout = @@global.connect_timeout; '#---------------------FN_DYNVARS_019_09----------------------#' SET connect_timeout = 1; ERROR HY000: Variable 'connect_timeout' is a GLOBAL variable and should be set with SET GLOBAL -SET global.connect_timeout = 1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'connect_timeout = 1' at line 1 SELECT global.connect_timeout; ERROR 42S02: Unknown table 'global' in field list SELECT connect_timeout = @@session.connect_timeout; diff --git a/mysql-test/suite/sys_vars/r/default_master_connection_basic.result b/mysql-test/suite/sys_vars/r/default_master_connection_basic.result index 78425049324..bb82e3d5bd6 100644 --- a/mysql-test/suite/sys_vars/r/default_master_connection_basic.result +++ b/mysql-test/suite/sys_vars/r/default_master_connection_basic.result @@ -78,12 +78,8 @@ SET default_master_connection = 'foo'; SELECT @@default_master_connection; @@default_master_connection foo -SET local.default_master_connection = 'foo'; -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 'default_master_connection = 'foo'' at line 1 SELECT local.default_master_connection; ERROR 42S02: Unknown table 'local' in field list -SET session.default_master_connection = 'foo'; -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 'default_master_connection = 'foo'' at line 1 SELECT session.default_master_connection; ERROR 42S02: Unknown table 'session' in field list SELECT default_master_connection = @@session.default_master_connection; diff --git a/mysql-test/suite/sys_vars/r/default_week_format_basic.result b/mysql-test/suite/sys_vars/r/default_week_format_basic.result index 1ba931734e9..4e9ee26ef9a 100644 --- a/mysql-test/suite/sys_vars/r/default_week_format_basic.result +++ b/mysql-test/suite/sys_vars/r/default_week_format_basic.result @@ -151,12 +151,8 @@ SET default_week_format = 1; SELECT @@default_week_format; @@default_week_format 1 -SET local.default_week_format = 1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'default_week_format = 1' at line 1 SELECT local.default_week_format; ERROR 42S02: Unknown table 'local' in field list -SET session.default_week_format = 1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'default_week_format = 1' at line 1 SELECT session.default_week_format; ERROR 42S02: Unknown table 'session' in field list SELECT default_week_format = @@session.default_week_format; diff --git a/mysql-test/suite/sys_vars/r/delayed_insert_limit_basic.result b/mysql-test/suite/sys_vars/r/delayed_insert_limit_basic.result index 6acc2398bbd..f57fe02f810 100644 --- a/mysql-test/suite/sys_vars/r/delayed_insert_limit_basic.result +++ b/mysql-test/suite/sys_vars/r/delayed_insert_limit_basic.result @@ -95,12 +95,8 @@ ERROR HY000: Variable 'delayed_insert_limit' is a GLOBAL variable and should be SELECT @@delayed_insert_limit; @@delayed_insert_limit 1 -SET local.delayed_insert_limit = 1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'delayed_insert_limit = 1' at line 1 SELECT local.delayed_insert_limit; ERROR 42S02: Unknown table 'local' in field list -SET global.delayed_insert_limit = 1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'delayed_insert_limit = 1' at line 1 SELECT global.delayed_insert_limit; ERROR 42S02: Unknown table 'global' in field list SELECT delayed_insert_limit = @@session.delayed_insert_limit; diff --git a/mysql-test/suite/sys_vars/r/delayed_insert_timeout_basic.result b/mysql-test/suite/sys_vars/r/delayed_insert_timeout_basic.result index 7b2f98e3682..f9978929698 100644 --- a/mysql-test/suite/sys_vars/r/delayed_insert_timeout_basic.result +++ b/mysql-test/suite/sys_vars/r/delayed_insert_timeout_basic.result @@ -93,12 +93,8 @@ ERROR HY000: Variable 'delayed_insert_timeout' is a GLOBAL variable and should b SELECT @@delayed_insert_timeout; @@delayed_insert_timeout 1 -SET local.delayed_insert_timeout = 1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'delayed_insert_timeout = 1' at line 1 SELECT local.delayed_insert_timeout; ERROR 42S02: Unknown table 'local' in field list -SET global.delayed_insert_timeout = 1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'delayed_insert_timeout = 1' at line 1 SELECT global.delayed_insert_timeout; ERROR 42S02: Unknown table 'global' in field list SELECT delayed_insert_timeout = @@session.delayed_insert_timeout; diff --git a/mysql-test/suite/sys_vars/r/delayed_queue_size_basic.result b/mysql-test/suite/sys_vars/r/delayed_queue_size_basic.result index 04aad26f0e8..61bd04965fe 100644 --- a/mysql-test/suite/sys_vars/r/delayed_queue_size_basic.result +++ b/mysql-test/suite/sys_vars/r/delayed_queue_size_basic.result @@ -93,12 +93,8 @@ ERROR HY000: Variable 'delayed_queue_size' is a GLOBAL variable and should be se SELECT @@delayed_queue_size; @@delayed_queue_size 1 -SET local.delayed_queue_size = 1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'delayed_queue_size = 1' at line 1 SELECT local.delayed_queue_size; ERROR 42S02: Unknown table 'local' in field list -SET global.delayed_queue_size = 1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'delayed_queue_size = 1' at line 1 SELECT global.delayed_queue_size; ERROR 42S02: Unknown table 'global' in field list SELECT delayed_queue_size = @@session.delayed_queue_size; diff --git a/mysql-test/suite/sys_vars/r/div_precision_increment_basic.result b/mysql-test/suite/sys_vars/r/div_precision_increment_basic.result index 570824f8df6..db2fb18562f 100644 --- a/mysql-test/suite/sys_vars/r/div_precision_increment_basic.result +++ b/mysql-test/suite/sys_vars/r/div_precision_increment_basic.result @@ -167,12 +167,8 @@ SET div_precision_increment = 1; SELECT @@div_precision_increment; @@div_precision_increment 1 -SET local.div_precision_increment = 1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'div_precision_increment = 1' at line 1 SELECT local.div_precision_increment; ERROR 42S02: Unknown table 'local' in field list -SET session.div_precision_increment = 1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'div_precision_increment = 1' at line 1 SELECT session.div_precision_increment; ERROR 42S02: Unknown table 'session' in field list SELECT div_precision_increment = @@session.div_precision_increment; diff --git a/mysql-test/suite/sys_vars/r/event_scheduler_basic.result b/mysql-test/suite/sys_vars/r/event_scheduler_basic.result index 04d3f5e5888..920b9ebbbfa 100644 --- a/mysql-test/suite/sys_vars/r/event_scheduler_basic.result +++ b/mysql-test/suite/sys_vars/r/event_scheduler_basic.result @@ -83,12 +83,8 @@ SELECT @@event_scheduler = @@global.event_scheduler; '#---------------------FN_DYNVARS_004_09----------------------#' SET event_scheduler = ON; ERROR HY000: Variable 'event_scheduler' is a GLOBAL variable and should be set with SET GLOBAL -SET local.event_scheduler = OFF; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'event_scheduler = OFF' at line 1 SELECT local.event_scheduler; ERROR 42S02: Unknown table 'local' in field list -SET global.event_scheduler = ON; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'event_scheduler = ON' at line 1 SELECT global.event_scheduler; ERROR 42S02: Unknown table 'global' in field list SELECT event_scheduler = @@session.event_scheduler; diff --git a/mysql-test/suite/sys_vars/r/expire_logs_days_basic.result b/mysql-test/suite/sys_vars/r/expire_logs_days_basic.result index d55ad7a73b9..f36fbd17321 100644 --- a/mysql-test/suite/sys_vars/r/expire_logs_days_basic.result +++ b/mysql-test/suite/sys_vars/r/expire_logs_days_basic.result @@ -113,12 +113,8 @@ ERROR HY000: Variable 'expire_logs_days' is a GLOBAL variable and should be set SELECT @@expire_logs_days; @@expire_logs_days 1 -SET local.expire_logs_days = 1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'expire_logs_days = 1' at line 1 SELECT local.expire_logs_days; ERROR 42S02: Unknown table 'local' in field list -SET global.expire_logs_days = 1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'expire_logs_days = 1' at line 1 SELECT global.expire_logs_days; ERROR 42S02: Unknown table 'global' in field list SELECT expire_logs_days = @@session.expire_logs_days; diff --git a/mysql-test/suite/sys_vars/r/flush_basic.result b/mysql-test/suite/sys_vars/r/flush_basic.result index fabbf476052..78a2875f89e 100644 --- a/mysql-test/suite/sys_vars/r/flush_basic.result +++ b/mysql-test/suite/sys_vars/r/flush_basic.result @@ -83,8 +83,6 @@ SELECT @@flush = @@global.flush; '#---------------------FN_DYNVARS_030_09----------------------#' SET flush = 1; ERROR HY000: Variable 'flush' is a GLOBAL variable and should be set with SET GLOBAL -SET global.flush = 1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'flush = 1' at line 1 SELECT global.flush; ERROR 42S02: Unknown table 'global' in field list SELECT flush = @@session.flush; diff --git a/mysql-test/suite/sys_vars/r/general_log_basic.result b/mysql-test/suite/sys_vars/r/general_log_basic.result index 1d16bc7c4d5..fe8e08e5e3b 100644 --- a/mysql-test/suite/sys_vars/r/general_log_basic.result +++ b/mysql-test/suite/sys_vars/r/general_log_basic.result @@ -78,12 +78,8 @@ SELECT @@general_log = @@global.general_log; '#---------------------FN_DYNVARS_004_09----------------------#' SET general_log = ON; ERROR HY000: Variable 'general_log' is a GLOBAL variable and should be set with SET GLOBAL -SET local.general_log = OFF; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'general_log = OFF' at line 1 SELECT local.general_log; ERROR 42S02: Unknown table 'local' in field list -SET global.general_log = ON; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'general_log = ON' at line 1 SELECT global.general_log; ERROR 42S02: Unknown table 'global' in field list SELECT general_log = @@session.general_log; diff --git a/mysql-test/suite/sys_vars/r/identity_basic.result b/mysql-test/suite/sys_vars/r/identity_basic.result index 40111ead253..6238f7db3b8 100644 --- a/mysql-test/suite/sys_vars/r/identity_basic.result +++ b/mysql-test/suite/sys_vars/r/identity_basic.result @@ -108,12 +108,8 @@ SET identity = 1; SELECT @@identity; @@identity 1 -SET local.identity = 1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'identity = 1' at line 1 SELECT local.identity; ERROR 42S02: Unknown table 'local' in field list -SET session.identity = 1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'identity = 1' at line 1 SELECT session.identity; ERROR 42S02: Unknown table 'session' in field list SELECT identity = @@session.identity; diff --git a/mysql-test/suite/sys_vars/r/insert_id_basic.result b/mysql-test/suite/sys_vars/r/insert_id_basic.result index 318563f7e42..f8ae8994120 100644 --- a/mysql-test/suite/sys_vars/r/insert_id_basic.result +++ b/mysql-test/suite/sys_vars/r/insert_id_basic.result @@ -108,12 +108,8 @@ SET insert_id = 1; SELECT @@insert_id; @@insert_id 1 -SET local.insert_id = 1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'insert_id = 1' at line 1 SELECT local.insert_id; ERROR 42S02: Unknown table 'local' in field list -SET session.insert_id = 1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'insert_id = 1' at line 1 SELECT session.insert_id; ERROR 42S02: Unknown table 'session' in field list SELECT insert_id = @@session.insert_id; diff --git a/mysql-test/suite/sys_vars/r/key_buffer_size_basic.result b/mysql-test/suite/sys_vars/r/key_buffer_size_basic.result index 4a63be5fd22..084e342dc2d 100644 --- a/mysql-test/suite/sys_vars/r/key_buffer_size_basic.result +++ b/mysql-test/suite/sys_vars/r/key_buffer_size_basic.result @@ -62,12 +62,8 @@ SELECT @@key_buffer_size = @@global.key_buffer_size; '#---------------------FN_DYNVARS_055_09----------------------#' SET key_buffer_size = 8 ; ERROR HY000: Variable 'key_buffer_size' is a GLOBAL variable and should be set with SET GLOBAL -SET local.key_buffer_size = 10; -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 'key_buffer_size = 10' at line 1 SELECT local.key_buffer_size; ERROR 42S02: Unknown table 'local' in field list -SET global.key_buffer_size = 10; -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 'key_buffer_size = 10' at line 1 SELECT global.key_buffer_size; ERROR 42S02: Unknown table 'global' in field list SELECT key_buffer_size = @@session.key_buffer_size; diff --git a/mysql-test/suite/sys_vars/r/key_cache_age_threshold_basic.result b/mysql-test/suite/sys_vars/r/key_cache_age_threshold_basic.result index f2a59e419e4..df339d7e3ab 100644 --- a/mysql-test/suite/sys_vars/r/key_cache_age_threshold_basic.result +++ b/mysql-test/suite/sys_vars/r/key_cache_age_threshold_basic.result @@ -115,12 +115,8 @@ ERROR HY000: Variable 'key_cache_age_threshold' is a GLOBAL variable and should SELECT @@key_cache_age_threshold; @@key_cache_age_threshold 100 -SET local.key_cache_age_threshold = 10; -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 'key_cache_age_threshold = 10' at line 1 SELECT local.key_cache_age_threshold; ERROR 42S02: Unknown table 'local' in field list -SET global.key_cache_age_threshold = 10; -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 'key_cache_age_threshold = 10' at line 1 SELECT global.key_cache_age_threshold; ERROR 42S02: Unknown table 'global' in field list SELECT key_cache_age_threshold = @@session.key_cache_age_threshold; diff --git a/mysql-test/suite/sys_vars/r/key_cache_block_size_basic.result b/mysql-test/suite/sys_vars/r/key_cache_block_size_basic.result index db8273ceed5..7271a307b7b 100644 --- a/mysql-test/suite/sys_vars/r/key_cache_block_size_basic.result +++ b/mysql-test/suite/sys_vars/r/key_cache_block_size_basic.result @@ -125,12 +125,8 @@ ERROR HY000: Variable 'key_cache_block_size' is a GLOBAL variable and should be SELECT @@key_cache_block_size; @@key_cache_block_size 1024 -SET local.key_cache_block_size = 10; -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 'key_cache_block_size = 10' at line 1 SELECT local.key_cache_block_size; ERROR 42S02: Unknown table 'local' in field list -SET global.key_cache_block_size = 10; -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 'key_cache_block_size = 10' at line 1 SELECT global.key_cache_block_size; ERROR 42S02: Unknown table 'global' in field list SELECT key_cache_block_size = @@session.key_cache_block_size; diff --git a/mysql-test/suite/sys_vars/r/key_cache_division_limit_basic.result b/mysql-test/suite/sys_vars/r/key_cache_division_limit_basic.result index 83dcea6d096..df17e92f702 100644 --- a/mysql-test/suite/sys_vars/r/key_cache_division_limit_basic.result +++ b/mysql-test/suite/sys_vars/r/key_cache_division_limit_basic.result @@ -119,12 +119,8 @@ ERROR HY000: Variable 'key_cache_division_limit' is a GLOBAL variable and should SELECT @@key_cache_division_limit; @@key_cache_division_limit 90 -SET local.key_cache_division_limit = 10; -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 'key_cache_division_limit = 10' at line 1 SELECT local.key_cache_division_limit; ERROR 42S02: Unknown table 'local' in field list -SET global.key_cache_division_limit = 10; -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 'key_cache_division_limit = 10' at line 1 SELECT global.key_cache_division_limit; ERROR 42S02: Unknown table 'global' in field list SELECT key_cache_division_limit = @@session.key_cache_division_limit; diff --git a/mysql-test/suite/sys_vars/r/key_cache_file_hash_size_basic.result b/mysql-test/suite/sys_vars/r/key_cache_file_hash_size_basic.result index 52ebfc98cdc..6ee871f791e 100644 --- a/mysql-test/suite/sys_vars/r/key_cache_file_hash_size_basic.result +++ b/mysql-test/suite/sys_vars/r/key_cache_file_hash_size_basic.result @@ -98,12 +98,8 @@ ERROR HY000: Variable 'key_cache_file_hash_size' is a GLOBAL variable and should SELECT @@key_cache_file_hash_size; @@key_cache_file_hash_size 150 -SET local.key_cache_file_hash_size = 10; -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 'key_cache_file_hash_size = 10' at line 1 SELECT local.key_cache_file_hash_size; ERROR 42S02: Unknown table 'local' in field list -SET global.key_cache_file_hash_size = 10; -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 'key_cache_file_hash_size = 10' at line 1 SELECT global.key_cache_file_hash_size; ERROR 42S02: Unknown table 'global' in field list SELECT key_cache_file_hash_size = @@session.key_cache_file_hash_size; diff --git a/mysql-test/suite/sys_vars/r/lc_time_names_basic.result b/mysql-test/suite/sys_vars/r/lc_time_names_basic.result index ed03c3e6d94..7d98f44f27b 100644 --- a/mysql-test/suite/sys_vars/r/lc_time_names_basic.result +++ b/mysql-test/suite/sys_vars/r/lc_time_names_basic.result @@ -21,8 +21,6 @@ SET lc_time_names=ar_AE; SELECT @@session.lc_time_names; @@session.lc_time_names ar_AE -SET global.lc_time_names=ar_AE; -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 'lc_time_names=ar_AE' at line 1 SET session lc_time_names=ar_AE; SELECT session lc_time_names; ERROR 42S22: Unknown column 'session' in 'field list' diff --git a/mysql-test/suite/sys_vars/r/local_infile_basic.result b/mysql-test/suite/sys_vars/r/local_infile_basic.result index f74a394cff9..81a7a39ef21 100644 --- a/mysql-test/suite/sys_vars/r/local_infile_basic.result +++ b/mysql-test/suite/sys_vars/r/local_infile_basic.result @@ -87,8 +87,6 @@ ERROR HY000: Variable 'local_infile' is a GLOBAL variable and should be set with SELECT @@local_infile; @@local_infile 1 -SET global.local_infile = 1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'local_infile = 1' at line 1 SELECT global.local_infile; ERROR 42S02: Unknown table 'global' in field list SELECT local_infile = @@session.local_infile; diff --git a/mysql-test/suite/sys_vars/r/max_binlog_cache_size_basic.result b/mysql-test/suite/sys_vars/r/max_binlog_cache_size_basic.result index d6a7487c162..e84c2aa40dd 100644 --- a/mysql-test/suite/sys_vars/r/max_binlog_cache_size_basic.result +++ b/mysql-test/suite/sys_vars/r/max_binlog_cache_size_basic.result @@ -137,12 +137,8 @@ ERROR HY000: Variable 'max_binlog_cache_size' is a GLOBAL variable and should be SELECT @@max_binlog_cache_size; @@max_binlog_cache_size 4096 -SET local.max_binlog_cache_size = 7000; -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 'max_binlog_cache_size = 7000' at line 1 SELECT local.max_binlog_cache_size; ERROR 42S02: Unknown table 'local' in field list -SET global.max_binlog_cache_size = 8000; -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 'max_binlog_cache_size = 8000' at line 1 SELECT global.max_binlog_cache_size; ERROR 42S02: Unknown table 'global' in field list SELECT max_binlog_cache_size = @@session.max_binlog_cache_size; diff --git a/mysql-test/suite/sys_vars/r/max_binlog_size_basic.result b/mysql-test/suite/sys_vars/r/max_binlog_size_basic.result index 87883351eb6..4a1e3beda67 100644 --- a/mysql-test/suite/sys_vars/r/max_binlog_size_basic.result +++ b/mysql-test/suite/sys_vars/r/max_binlog_size_basic.result @@ -136,12 +136,8 @@ ERROR HY000: Variable 'max_binlog_size' is a GLOBAL variable and should be set w SELECT @@max_binlog_size; @@max_binlog_size 4096 -SET local.max_binlog_size = 7000; -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 'max_binlog_size = 7000' at line 1 SELECT local.max_binlog_size; ERROR 42S02: Unknown table 'local' in field list -SET global.max_binlog_size = 8000; -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 'max_binlog_size = 8000' at line 1 SELECT global.max_binlog_size; ERROR 42S02: Unknown table 'global' in field list SELECT max_binlog_size = @@session.max_binlog_size; diff --git a/mysql-test/suite/sys_vars/r/max_binlog_stmt_cache_size_basic.result b/mysql-test/suite/sys_vars/r/max_binlog_stmt_cache_size_basic.result index 98e595cc4c3..5f4c5e3fd71 100644 --- a/mysql-test/suite/sys_vars/r/max_binlog_stmt_cache_size_basic.result +++ b/mysql-test/suite/sys_vars/r/max_binlog_stmt_cache_size_basic.result @@ -137,12 +137,8 @@ ERROR HY000: Variable 'max_binlog_stmt_cache_size' is a GLOBAL variable and shou SELECT @@max_binlog_stmt_cache_size; @@max_binlog_stmt_cache_size 4096 -SET local.max_binlog_stmt_cache_size = 7000; -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 'max_binlog_stmt_cache_size = 7000' at line 1 SELECT local.max_binlog_stmt_cache_size; ERROR 42S02: Unknown table 'local' in field list -SET global.max_binlog_stmt_cache_size = 8000; -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 'max_binlog_stmt_cache_size = 8000' at line 1 SELECT global.max_binlog_stmt_cache_size; ERROR 42S02: Unknown table 'global' in field list SELECT max_binlog_stmt_cache_size = @@session.max_binlog_stmt_cache_size; diff --git a/mysql-test/suite/sys_vars/r/max_connect_errors_basic.result b/mysql-test/suite/sys_vars/r/max_connect_errors_basic.result index 99bc0727ad8..01e8ef464fb 100644 --- a/mysql-test/suite/sys_vars/r/max_connect_errors_basic.result +++ b/mysql-test/suite/sys_vars/r/max_connect_errors_basic.result @@ -118,12 +118,8 @@ ERROR HY000: Variable 'max_connect_errors' is a GLOBAL variable and should be se SELECT @@max_connect_errors; @@max_connect_errors 5000 -SET local.max_connect_errors = 7000; -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 'max_connect_errors = 7000' at line 1 SELECT local.max_connect_errors; ERROR 42S02: Unknown table 'local' in field list -SET global.max_connect_errors = 8000; -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 'max_connect_errors = 8000' at line 1 SELECT global.max_connect_errors; ERROR 42S02: Unknown table 'global' in field list SELECT max_connect_errors = @@session.max_connect_errors; diff --git a/mysql-test/suite/sys_vars/r/max_connections_basic.result b/mysql-test/suite/sys_vars/r/max_connections_basic.result index 708342b016d..c215f2130c7 100644 --- a/mysql-test/suite/sys_vars/r/max_connections_basic.result +++ b/mysql-test/suite/sys_vars/r/max_connections_basic.result @@ -118,12 +118,8 @@ ERROR HY000: Variable 'max_connections' is a GLOBAL variable and should be set w SELECT @@max_connections; @@max_connections 5000 -SET local.max_connections = 7000; -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 'max_connections = 7000' at line 1 SELECT local.max_connections; ERROR 42S02: Unknown table 'local' in field list -SET global.max_connections = 8000; -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 'max_connections = 8000' at line 1 SELECT global.max_connections; ERROR 42S02: Unknown table 'global' in field list SELECT max_connections = @@session.max_connections; diff --git a/mysql-test/suite/sys_vars/r/max_prepared_stmt_count_basic.result b/mysql-test/suite/sys_vars/r/max_prepared_stmt_count_basic.result index 9419f251930..9ee2e170051 100644 --- a/mysql-test/suite/sys_vars/r/max_prepared_stmt_count_basic.result +++ b/mysql-test/suite/sys_vars/r/max_prepared_stmt_count_basic.result @@ -116,12 +116,8 @@ ERROR HY000: Variable 'max_prepared_stmt_count' is a GLOBAL variable and should SELECT @@max_prepared_stmt_count; @@max_prepared_stmt_count 5000 -SET local.max_prepared_stmt_count = 7000; -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 'max_prepared_stmt_count = 7000' at line 1 SELECT local.max_prepared_stmt_count; ERROR 42S02: Unknown table 'local' in field list -SET global.max_prepared_stmt_count = 8000; -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 'max_prepared_stmt_count = 8000' at line 1 SELECT global.max_prepared_stmt_count; ERROR 42S02: Unknown table 'global' in field list SELECT max_prepared_stmt_count = @@session.max_prepared_stmt_count; diff --git a/mysql-test/suite/sys_vars/r/max_relay_log_size_basic.result b/mysql-test/suite/sys_vars/r/max_relay_log_size_basic.result index 6025e28ccaa..efa2e05c59b 100644 --- a/mysql-test/suite/sys_vars/r/max_relay_log_size_basic.result +++ b/mysql-test/suite/sys_vars/r/max_relay_log_size_basic.result @@ -133,12 +133,8 @@ Warning 1292 Truncated incorrect max_relay_log_size value: '6000' SELECT @@max_relay_log_size; @@max_relay_log_size 4096 -SET local.max_relay_log_size = 7000; -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 'max_relay_log_size = 7000' at line 1 SELECT local.max_relay_log_size; ERROR 42S02: Unknown table 'local' in field list -SET global.max_relay_log_size = 8000; -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 'max_relay_log_size = 8000' at line 1 SELECT global.max_relay_log_size; ERROR 42S02: Unknown table 'global' in field list SELECT max_relay_log_size = @@session.max_relay_log_size; diff --git a/mysql-test/suite/sys_vars/r/myisam_stats_method_basic.result b/mysql-test/suite/sys_vars/r/myisam_stats_method_basic.result index e9150338317..19d7ba6ffb6 100644 --- a/mysql-test/suite/sys_vars/r/myisam_stats_method_basic.result +++ b/mysql-test/suite/sys_vars/r/myisam_stats_method_basic.result @@ -105,10 +105,6 @@ SELECT @@global.myisam_stats_method; NULLS_UNEQUAL '#---------------------FN_DYNVARS_097_09----------------------#' SET myisam_stats_method = 'nulls_equal'; -SET session.myisam_stats_method = 'nulls_equal'; -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 'myisam_stats_method = 'nulls_equal'' at line 1 -SET global.myisam_stats_method = 'nulls_equal'; -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 'myisam_stats_method = 'nulls_equal'' at line 1 SET session myisam_stats_method = 'nulls_equal'; SELECT @@myisam_stats_method; @@myisam_stats_method diff --git a/mysql-test/suite/sys_vars/r/mysql56_temporal_format_basic.result b/mysql-test/suite/sys_vars/r/mysql56_temporal_format_basic.result index 8f4500b2650..7181cba99a1 100644 --- a/mysql-test/suite/sys_vars/r/mysql56_temporal_format_basic.result +++ b/mysql-test/suite/sys_vars/r/mysql56_temporal_format_basic.result @@ -83,8 +83,6 @@ SELECT @@mysql56_temporal_format = @@global.mysql56_temporal_format; '#---------------------FN_DYNVARS_030_09----------------------#' SET mysql56_temporal_format = 1; ERROR HY000: Variable 'mysql56_temporal_format' is a GLOBAL variable and should be set with SET GLOBAL -SET global.mysql56_temporal_format = 1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'mysql56_temporal_format = 1' at line 1 SELECT global.mysql56_temporal_format; ERROR 42S02: Unknown table 'global' in field list SELECT mysql56_temporal_format = @@session.mysql56_temporal_format; diff --git a/mysql-test/suite/sys_vars/r/old_mode_basic.result b/mysql-test/suite/sys_vars/r/old_mode_basic.result index 052221d796e..39c8e554be2 100644 --- a/mysql-test/suite/sys_vars/r/old_mode_basic.result +++ b/mysql-test/suite/sys_vars/r/old_mode_basic.result @@ -132,10 +132,6 @@ SELECT @@global.old_mode; '#---------------------FN_DYNVARS_152_09----------------------#' SET old_mode = 'NO_PROGRESS_INFO'; -SET session.old_mode = 'ANSI'; -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 'old_mode = 'ANSI'' at line 1 -SET global.old_mode = 'ANSI'; -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 'old_mode = 'ANSI'' at line 1 SET session old_mode = 1; SELECT @@old_mode; @@old_mode diff --git a/mysql-test/suite/sys_vars/r/query_cache_limit_basic.result b/mysql-test/suite/sys_vars/r/query_cache_limit_basic.result index 892bc306bcb..ba70a76ae55 100644 --- a/mysql-test/suite/sys_vars/r/query_cache_limit_basic.result +++ b/mysql-test/suite/sys_vars/r/query_cache_limit_basic.result @@ -113,12 +113,8 @@ ERROR HY000: Variable 'query_cache_limit' is a GLOBAL variable and should be set SELECT @@query_cache_limit; @@query_cache_limit 1 -SET local.query_cache_limit = 1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'query_cache_limit = 1' at line 1 SELECT local.query_cache_limit; ERROR 42S02: Unknown table 'local' in field list -SET global.query_cache_limit = 1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'query_cache_limit = 1' at line 1 SELECT global.query_cache_limit; ERROR 42S02: Unknown table 'global' in field list SELECT query_cache_limit = @@session.query_cache_limit; diff --git a/mysql-test/suite/sys_vars/r/query_cache_min_res_unit_basic.result b/mysql-test/suite/sys_vars/r/query_cache_min_res_unit_basic.result index bc93f966376..a46476f0fdd 100644 --- a/mysql-test/suite/sys_vars/r/query_cache_min_res_unit_basic.result +++ b/mysql-test/suite/sys_vars/r/query_cache_min_res_unit_basic.result @@ -133,12 +133,8 @@ ERROR HY000: Variable 'query_cache_min_res_unit' is a GLOBAL variable and should SELECT @@query_cache_min_res_unit; @@query_cache_min_res_unit 512 -SET local.query_cache_min_res_unit = 1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'query_cache_min_res_unit = 1' at line 1 SELECT local.query_cache_min_res_unit; ERROR 42S02: Unknown table 'local' in field list -SET global.query_cache_min_res_unit = 1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'query_cache_min_res_unit = 1' at line 1 SELECT global.query_cache_min_res_unit; ERROR 42S02: Unknown table 'global' in field list SELECT query_cache_min_res_unit = @@session.query_cache_min_res_unit; diff --git a/mysql-test/suite/sys_vars/r/query_cache_size_basic.result b/mysql-test/suite/sys_vars/r/query_cache_size_basic.result index ee959a45fa0..5d4e0a54ad9 100644 --- a/mysql-test/suite/sys_vars/r/query_cache_size_basic.result +++ b/mysql-test/suite/sys_vars/r/query_cache_size_basic.result @@ -120,12 +120,8 @@ ERROR HY000: Variable 'query_cache_size' is a GLOBAL variable and should be set SELECT @@query_cache_size; @@query_cache_size 0 -SET local.query_cache_size = 1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'query_cache_size = 1' at line 1 SELECT local.query_cache_size; ERROR 42S02: Unknown table 'local' in field list -SET global.query_cache_size = 1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'query_cache_size = 1' at line 1 SELECT global.query_cache_size; ERROR 42S02: Unknown table 'global' in field list SELECT query_cache_size = @@session.query_cache_size; diff --git a/mysql-test/suite/sys_vars/r/read_only_basic.result b/mysql-test/suite/sys_vars/r/read_only_basic.result index 6c2c50ced46..4048e9754c4 100644 --- a/mysql-test/suite/sys_vars/r/read_only_basic.result +++ b/mysql-test/suite/sys_vars/r/read_only_basic.result @@ -102,12 +102,8 @@ ERROR HY000: Variable 'read_only' is a GLOBAL variable and should be set with SE SELECT @@read_only; @@read_only 1 -SET local.read_only = 1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'read_only = 1' at line 1 SELECT local.read_only; ERROR 42S02: Unknown table 'local' in field list -SET global.read_only = 1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'read_only = 1' at line 1 SELECT global.read_only; ERROR 42S02: Unknown table 'global' in field list SELECT read_only = @@session.read_only; diff --git a/mysql-test/suite/sys_vars/r/relay_log_purge_basic.result b/mysql-test/suite/sys_vars/r/relay_log_purge_basic.result index 8de09fe6b39..e00be57692e 100644 --- a/mysql-test/suite/sys_vars/r/relay_log_purge_basic.result +++ b/mysql-test/suite/sys_vars/r/relay_log_purge_basic.result @@ -82,8 +82,6 @@ SELECT @@relay_log_purge = @@global.relay_log_purge; '#---------------------FN_DYNVARS_141_08----------------------#' SET relay_log_purge = 1; ERROR HY000: Variable 'relay_log_purge' is a GLOBAL variable and should be set with SET GLOBAL -SET global.relay_log_purge = 1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'relay_log_purge = 1' at line 1 SELECT global.relay_log_purge; ERROR 42S02: Unknown table 'global' in field list SELECT relay_log_purge = @@session.relay_log_purge; diff --git a/mysql-test/suite/sys_vars/r/slave_max_allowed_packet_basic.result b/mysql-test/suite/sys_vars/r/slave_max_allowed_packet_basic.result index a5fe9b35ed5..9cbfb9b2c11 100644 --- a/mysql-test/suite/sys_vars/r/slave_max_allowed_packet_basic.result +++ b/mysql-test/suite/sys_vars/r/slave_max_allowed_packet_basic.result @@ -131,12 +131,8 @@ ERROR HY000: Variable 'slave_max_allowed_packet' is a GLOBAL variable and should SELECT @@slave_max_allowed_packet; @@slave_max_allowed_packet 4096 -SET local.slave_max_allowed_packet = 7000; -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 'slave_max_allowed_packet = 7000' at line 1 SELECT local.slave_max_allowed_packet; ERROR 42S02: Unknown table 'local' in field list -SET global.slave_max_allowed_packet = 8000; -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 'slave_max_allowed_packet = 8000' at line 1 SELECT global.slave_max_allowed_packet; ERROR 42S02: Unknown table 'global' in field list SELECT slave_max_allowed_packet = @@session.slave_max_allowed_packet; diff --git a/mysql-test/suite/sys_vars/r/slow_launch_time_basic.result b/mysql-test/suite/sys_vars/r/slow_launch_time_basic.result index e21b177eec4..3acd29b0c62 100644 --- a/mysql-test/suite/sys_vars/r/slow_launch_time_basic.result +++ b/mysql-test/suite/sys_vars/r/slow_launch_time_basic.result @@ -117,12 +117,8 @@ ERROR HY000: Variable 'slow_launch_time' is a GLOBAL variable and should be set SELECT @@slow_launch_time; @@slow_launch_time 1 -SET local.slow_launch_time = 1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'slow_launch_time = 1' at line 1 SELECT local.slow_launch_time; ERROR 42S02: Unknown table 'local' in field list -SET global.slow_launch_time = 1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'slow_launch_time = 1' at line 1 SELECT global.slow_launch_time; ERROR 42S02: Unknown table 'global' in field list SELECT slow_launch_time = @@session.slow_launch_time; diff --git a/mysql-test/suite/sys_vars/r/slow_query_log_basic.result b/mysql-test/suite/sys_vars/r/slow_query_log_basic.result index 049404f5648..17dfdeea3f3 100644 --- a/mysql-test/suite/sys_vars/r/slow_query_log_basic.result +++ b/mysql-test/suite/sys_vars/r/slow_query_log_basic.result @@ -84,12 +84,8 @@ SELECT @@slow_query_log = @@global.slow_query_log; @@slow_query_log = @@global.slow_query_log 0 '#---------------------FN_DYNVARS_004_09----------------------#' -SET local.slow_query_log = OFF; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'slow_query_log = OFF' at line 1 SELECT local.slow_query_log; ERROR 42S02: Unknown table 'local' in field list -SET global.slow_query_log = ON; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'slow_query_log = ON' at line 1 SELECT global.slow_query_log; ERROR 42S02: Unknown table 'global' in field list SELECT slow_query_log = @@session.slow_query_log; diff --git a/mysql-test/suite/sys_vars/r/sql_mode_basic.result b/mysql-test/suite/sys_vars/r/sql_mode_basic.result index 2e3ca45d4f5..1bd35c0656f 100644 --- a/mysql-test/suite/sys_vars/r/sql_mode_basic.result +++ b/mysql-test/suite/sys_vars/r/sql_mode_basic.result @@ -381,10 +381,6 @@ SELECT @@global.sql_mode; '#---------------------FN_DYNVARS_152_09----------------------#' SET sql_mode = 'ANSI'; -SET session.sql_mode = 'ANSI'; -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 'sql_mode = 'ANSI'' at line 1 -SET global.sql_mode = 'ANSI'; -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 'sql_mode = 'ANSI'' at line 1 SET session sql_mode = 1; SELECT @@sql_mode; @@sql_mode diff --git a/mysql-test/suite/sys_vars/r/sync_binlog_basic.result b/mysql-test/suite/sys_vars/r/sync_binlog_basic.result index bb0c8136391..cb0af255f33 100644 --- a/mysql-test/suite/sys_vars/r/sync_binlog_basic.result +++ b/mysql-test/suite/sys_vars/r/sync_binlog_basic.result @@ -98,12 +98,8 @@ ERROR HY000: Variable 'sync_binlog' is a GLOBAL variable and should be set with SELECT @@sync_binlog; @@sync_binlog 4294967295 -SET local.sync_binlog = 1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'sync_binlog = 1' at line 1 SELECT local.sync_binlog; ERROR 42S02: Unknown table 'local' in field list -SET global.sync_binlog = 1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'sync_binlog = 1' at line 1 SELECT global.sync_binlog; ERROR 42S02: Unknown table 'global' in field list SELECT sync_binlog = @@session.sync_binlog; diff --git a/mysql-test/suite/sys_vars/r/sync_frm_basic.result b/mysql-test/suite/sys_vars/r/sync_frm_basic.result index 0c633d30820..ce9d0a1f358 100644 --- a/mysql-test/suite/sys_vars/r/sync_frm_basic.result +++ b/mysql-test/suite/sys_vars/r/sync_frm_basic.result @@ -85,8 +85,6 @@ ERROR HY000: Variable 'sync_frm' is a GLOBAL variable and should be set with SET SELECT @@sync_frm; @@sync_frm 1 -SET global.sync_frm = 1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'sync_frm = 1' at line 1 SELECT global.sync_frm; ERROR 42S02: Unknown table 'global' in field list SELECT sync_frm = @@session.sync_frm; diff --git a/mysql-test/suite/sys_vars/r/table_definition_cache_basic.result b/mysql-test/suite/sys_vars/r/table_definition_cache_basic.result index f6befe51bc1..54b50c5ff75 100644 --- a/mysql-test/suite/sys_vars/r/table_definition_cache_basic.result +++ b/mysql-test/suite/sys_vars/r/table_definition_cache_basic.result @@ -99,8 +99,6 @@ SELECT @@table_definition_cache = @@global.table_definition_cache; '#---------------------FN_DYNVARS_019_09----------------------#' SET table_definition_cache = 1; ERROR HY000: Variable 'table_definition_cache' is a GLOBAL variable and should be set with SET GLOBAL -SET global.table_definition_cache = 1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'table_definition_cache = 1' at line 1 SELECT global.table_definition_cache; ERROR 42S02: Unknown table 'global' in field list SELECT table_definition_cache = @@session.table_definition_cache; diff --git a/mysql-test/suite/sys_vars/r/table_open_cache_basic.result b/mysql-test/suite/sys_vars/r/table_open_cache_basic.result index 4c635783753..4e9190e022d 100644 --- a/mysql-test/suite/sys_vars/r/table_open_cache_basic.result +++ b/mysql-test/suite/sys_vars/r/table_open_cache_basic.result @@ -95,8 +95,6 @@ SELECT @@table_open_cache = @@global.table_open_cache ; '#---------------------FN_DYNVARS_001_11----------------------#' SET table_open_cache = 8; ERROR HY000: Variable 'table_open_cache' is a GLOBAL variable and should be set with SET GLOBAL -SET global.table_open_cache = 10; -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 'table_open_cache = 10' at line 1 SELECT global.table_open_cache ; ERROR 42S02: Unknown table 'global' in field list SELECT table_open_cache = @@session.table_open_cache ; diff --git a/mysql-test/suite/sys_vars/r/tx_isolation_basic.result b/mysql-test/suite/sys_vars/r/tx_isolation_basic.result index 09ccebf12a2..f6ee2c92fa5 100644 --- a/mysql-test/suite/sys_vars/r/tx_isolation_basic.result +++ b/mysql-test/suite/sys_vars/r/tx_isolation_basic.result @@ -123,10 +123,6 @@ SELECT @@global.tx_isolation; READ-UNCOMMITTED '#---------------------FN_DYNVARS_183_09----------------------#' SET tx_isolation = 'REPEATABLE-READ'; -SET session.tx_isolation = 'REPEATABLE-READ'; -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 'tx_isolation = 'REPEATABLE-READ'' at line 1 -SET global.tx_isolation = 'REPEATABLE-READ'; -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 'tx_isolation = 'REPEATABLE-READ'' at line 1 SET session tx_isolation = 'REPEATABLE-READ'; SELECT @@tx_isolation; @@tx_isolation diff --git a/mysql-test/suite/sys_vars/t/automatic_sp_privileges_basic.test b/mysql-test/suite/sys_vars/t/automatic_sp_privileges_basic.test index dfa733a0b9b..6f7ceed0437 100644 --- a/mysql-test/suite/sys_vars/t/automatic_sp_privileges_basic.test +++ b/mysql-test/suite/sys_vars/t/automatic_sp_privileges_basic.test @@ -152,12 +152,8 @@ SELECT @@automatic_sp_privileges = @@global.automatic_sp_privileges; ############################################################################### --Error ER_GLOBAL_VARIABLE SET automatic_sp_privileges = 1; ---Error ER_PARSE_ERROR -SET local.automatic_sp_privileges = 1; --Error ER_UNKNOWN_TABLE SELECT local.automatic_sp_privileges; ---Error ER_PARSE_ERROR -SET global.automatic_sp_privileges = 1; --Error ER_UNKNOWN_TABLE SELECT global.automatic_sp_privileges; --Error ER_BAD_FIELD_ERROR diff --git a/mysql-test/suite/sys_vars/t/big_tables_basic.test b/mysql-test/suite/sys_vars/t/big_tables_basic.test index 89a7ee83bc8..d004feac3db 100644 --- a/mysql-test/suite/sys_vars/t/big_tables_basic.test +++ b/mysql-test/suite/sys_vars/t/big_tables_basic.test @@ -148,12 +148,8 @@ SELECT @@big_tables = @@local.big_tables and @@local.big_tables = @@session.big_ SET big_tables = 1; SELECT @@big_tables; ---Error ER_PARSE_ERROR -SET local.big_tables = 1; --Error ER_UNKNOWN_TABLE SELECT local.big_tables; ---Error ER_PARSE_ERROR -SET session.big_tables = 1; --Error ER_UNKNOWN_TABLE SELECT session.big_tables; --Error ER_BAD_FIELD_ERROR diff --git a/mysql-test/suite/sys_vars/t/binlog_cache_size_basic.test b/mysql-test/suite/sys_vars/t/binlog_cache_size_basic.test index 57822ef0b48..da098fc3495 100644 --- a/mysql-test/suite/sys_vars/t/binlog_cache_size_basic.test +++ b/mysql-test/suite/sys_vars/t/binlog_cache_size_basic.test @@ -134,8 +134,6 @@ SELECT @@binlog_cache_size = @@global.binlog_cache_size; --Error ER_GLOBAL_VARIABLE SET binlog_cache_size = 1; ---Error ER_PARSE_ERROR -SET global.binlog_cache_size = 1; --Error ER_UNKNOWN_TABLE SELECT global.binlog_cache_size; --Error ER_BAD_FIELD_ERROR diff --git a/mysql-test/suite/sys_vars/t/binlog_stmt_cache_size_basic.test b/mysql-test/suite/sys_vars/t/binlog_stmt_cache_size_basic.test index ecde1723c11..5c74c6fe8fe 100644 --- a/mysql-test/suite/sys_vars/t/binlog_stmt_cache_size_basic.test +++ b/mysql-test/suite/sys_vars/t/binlog_stmt_cache_size_basic.test @@ -134,8 +134,6 @@ SELECT @@binlog_stmt_cache_size = @@global.binlog_stmt_cache_size; --Error ER_GLOBAL_VARIABLE SET binlog_stmt_cache_size = 1; ---Error ER_PARSE_ERROR -SET global.binlog_stmt_cache_size = 1; --Error ER_UNKNOWN_TABLE SELECT global.binlog_stmt_cache_size; --Error ER_BAD_FIELD_ERROR diff --git a/mysql-test/suite/sys_vars/t/bulk_insert_buffer_size_basic.test b/mysql-test/suite/sys_vars/t/bulk_insert_buffer_size_basic.test index 5796db32565..125dc2fcf58 100644 --- a/mysql-test/suite/sys_vars/t/bulk_insert_buffer_size_basic.test +++ b/mysql-test/suite/sys_vars/t/bulk_insert_buffer_size_basic.test @@ -181,12 +181,8 @@ SELECT @@local.bulk_insert_buffer_size = @@session.bulk_insert_buffer_size; SET bulk_insert_buffer_size = 1; SELECT @@bulk_insert_buffer_size; ---Error ER_PARSE_ERROR -SET local.bulk_insert_buffer_size = 1; --Error ER_UNKNOWN_TABLE SELECT local.bulk_insert_buffer_size; ---Error ER_PARSE_ERROR -SET session.bulk_insert_buffer_size = 1; --Error ER_UNKNOWN_TABLE SELECT session.bulk_insert_buffer_size; --Error ER_BAD_FIELD_ERROR diff --git a/mysql-test/suite/sys_vars/t/character_set_client_basic.test b/mysql-test/suite/sys_vars/t/character_set_client_basic.test index 7b3d36fb16f..d8ae6a81444 100644 --- a/mysql-test/suite/sys_vars/t/character_set_client_basic.test +++ b/mysql-test/suite/sys_vars/t/character_set_client_basic.test @@ -62,8 +62,6 @@ SELECT character_set_client; SET character_set_client=utf8; SELECT @@session.character_set_client; # assign global variable without @@ ---Error ER_PARSE_ERROR -SET global.character_set_client=utf8; # using another syntax for accessing session variable SET session character_set_client=utf8; # accessing variable with scope the wrong way diff --git a/mysql-test/suite/sys_vars/t/character_set_connection_basic.test b/mysql-test/suite/sys_vars/t/character_set_connection_basic.test index e402dbb0ff5..bb63ff8db6a 100644 --- a/mysql-test/suite/sys_vars/t/character_set_connection_basic.test +++ b/mysql-test/suite/sys_vars/t/character_set_connection_basic.test @@ -62,8 +62,6 @@ SELECT character_set_connection; SET character_set_connection=utf8; SELECT @@session.character_set_connection; # assign global variable without @@ ---Error ER_PARSE_ERROR -SET global.character_set_connection=utf8; # using another syntax for accessing session variable SET session character_set_connection=utf8; # accessing variable with scope the wrong way diff --git a/mysql-test/suite/sys_vars/t/character_set_database_basic.test b/mysql-test/suite/sys_vars/t/character_set_database_basic.test index 4e650dc6139..f3a1ee45de0 100644 --- a/mysql-test/suite/sys_vars/t/character_set_database_basic.test +++ b/mysql-test/suite/sys_vars/t/character_set_database_basic.test @@ -62,8 +62,6 @@ SELECT character_set_database; SET character_set_database=utf8; SELECT @@session.character_set_database; # assign global variable without @@ ---Error ER_PARSE_ERROR -SET global.character_set_database=utf8; # using another syntax for accessing session variable SET session character_set_database=utf8; # accessing variable with scope the wrong way diff --git a/mysql-test/suite/sys_vars/t/character_set_filesystem_basic.test b/mysql-test/suite/sys_vars/t/character_set_filesystem_basic.test index 6bb2de35429..33b77eede06 100644 --- a/mysql-test/suite/sys_vars/t/character_set_filesystem_basic.test +++ b/mysql-test/suite/sys_vars/t/character_set_filesystem_basic.test @@ -62,9 +62,6 @@ SELECT character_set_filesystem; # assign value without @@ SET character_set_filesystem=utf8; SELECT @@session.character_set_filesystem; -# assign global variable without @@ ---Error ER_PARSE_ERROR -SET global.character_set_filesystem=utf8; # using another syntax for accessing session variable SET session character_set_filesystem=utf8; # accessing variable with scope the wrong way diff --git a/mysql-test/suite/sys_vars/t/character_set_results_basic.test b/mysql-test/suite/sys_vars/t/character_set_results_basic.test index 1bede9e493c..5472cd1509e 100644 --- a/mysql-test/suite/sys_vars/t/character_set_results_basic.test +++ b/mysql-test/suite/sys_vars/t/character_set_results_basic.test @@ -61,9 +61,6 @@ SELECT character_set_results; # assign value without @@ SET character_set_results=utf8; SELECT @@session.character_set_results; -# assign global variable without @@ ---Error ER_PARSE_ERROR -SET global.character_set_results=utf8; # using another syntax for accessing session variable SET session character_set_results=utf8; # accessing variable with scope the wrong way diff --git a/mysql-test/suite/sys_vars/t/character_set_server_basic.test b/mysql-test/suite/sys_vars/t/character_set_server_basic.test index d692c1f633c..adb80fcfffd 100644 --- a/mysql-test/suite/sys_vars/t/character_set_server_basic.test +++ b/mysql-test/suite/sys_vars/t/character_set_server_basic.test @@ -59,9 +59,6 @@ SELECT character_set_server; # assign value without @@ SET character_set_server=utf8; SELECT @@session.character_set_server; -# assign global variable without @@ ---Error ER_PARSE_ERROR -SET global.character_set_server=utf8; # using another syntax for accessing session variable SET session character_set_server=utf8; # accessing variable with scope the wrong way diff --git a/mysql-test/suite/sys_vars/t/collation_connection_basic.test b/mysql-test/suite/sys_vars/t/collation_connection_basic.test index 92f1766fc9c..963eadbbcbd 100644 --- a/mysql-test/suite/sys_vars/t/collation_connection_basic.test +++ b/mysql-test/suite/sys_vars/t/collation_connection_basic.test @@ -59,9 +59,6 @@ SELECT collation_connection; # assign value without @@ SET collation_connection=utf8_unicode_ci; SELECT @@session.collation_connection; -# assign global variable without @@ ---Error ER_PARSE_ERROR -SET global.collation_connection=utf8_unicode_ci; # using another syntax for accessing session variable SET session collation_connection=utf8_unicode_ci; # accessing variable with scope the wrong way diff --git a/mysql-test/suite/sys_vars/t/collation_database_basic.test b/mysql-test/suite/sys_vars/t/collation_database_basic.test index da06778bb68..04aee789746 100644 --- a/mysql-test/suite/sys_vars/t/collation_database_basic.test +++ b/mysql-test/suite/sys_vars/t/collation_database_basic.test @@ -59,9 +59,6 @@ SELECT collation_database; # assign value without @@ SET collation_database=utf8_unicode_ci; SELECT @@session.collation_database; -# assign global variable without @@ ---Error ER_PARSE_ERROR -SET global.collation_database=utf8_unicode_ci; # using another syntax for accessing session variable SET session collation_database=utf8_unicode_ci; # accessing variable with scope the wrong way diff --git a/mysql-test/suite/sys_vars/t/collation_server_basic.test b/mysql-test/suite/sys_vars/t/collation_server_basic.test index 0d01c7d3076..b8c2a25fc46 100644 --- a/mysql-test/suite/sys_vars/t/collation_server_basic.test +++ b/mysql-test/suite/sys_vars/t/collation_server_basic.test @@ -59,9 +59,6 @@ SELECT collation_server; # assign value without @@ SET collation_server=utf8_unicode_ci; SELECT @@session.collation_server; -# assign global variable without @@ ---Error ER_PARSE_ERROR -SET global.collation_server=utf8_unicode_ci; # using another syntax for accessing session variable SET session collation_server=utf8_unicode_ci; # accessing variable with scope the wrong way diff --git a/mysql-test/suite/sys_vars/t/completion_type_basic.test b/mysql-test/suite/sys_vars/t/completion_type_basic.test index 927654cd32a..7a962fbdf99 100644 --- a/mysql-test/suite/sys_vars/t/completion_type_basic.test +++ b/mysql-test/suite/sys_vars/t/completion_type_basic.test @@ -157,12 +157,8 @@ SELECT @@local.completion_type = @@session.completion_type; SET completion_type = 1; SELECT @@completion_type; ---Error ER_PARSE_ERROR -SET local.completion_type = 1; --Error ER_UNKNOWN_TABLE SELECT local.completion_type; ---Error ER_PARSE_ERROR -SET session.completion_type = 1; --Error ER_UNKNOWN_TABLE SELECT session.completion_type; --Error ER_BAD_FIELD_ERROR diff --git a/mysql-test/suite/sys_vars/t/concurrent_insert_basic.test b/mysql-test/suite/sys_vars/t/concurrent_insert_basic.test index 5be569e52d3..6f08915079a 100644 --- a/mysql-test/suite/sys_vars/t/concurrent_insert_basic.test +++ b/mysql-test/suite/sys_vars/t/concurrent_insert_basic.test @@ -164,8 +164,6 @@ SELECT @@concurrent_insert = @@global.concurrent_insert; --Error ER_GLOBAL_VARIABLE SET concurrent_insert = 1; SELECT @@concurrent_insert; ---Error ER_PARSE_ERROR -SET global.concurrent_insert = 1; --Error ER_UNKNOWN_TABLE SELECT global.concurrent_insert; --Error ER_BAD_FIELD_ERROR diff --git a/mysql-test/suite/sys_vars/t/connect_timeout_basic.test b/mysql-test/suite/sys_vars/t/connect_timeout_basic.test index d89734a00c2..b20006e5c96 100644 --- a/mysql-test/suite/sys_vars/t/connect_timeout_basic.test +++ b/mysql-test/suite/sys_vars/t/connect_timeout_basic.test @@ -131,8 +131,6 @@ SELECT @@connect_timeout = @@global.connect_timeout; --Error ER_GLOBAL_VARIABLE SET connect_timeout = 1; ---Error ER_PARSE_ERROR -SET global.connect_timeout = 1; --Error ER_UNKNOWN_TABLE SELECT global.connect_timeout; --Error ER_BAD_FIELD_ERROR diff --git a/mysql-test/suite/sys_vars/t/default_master_connection_basic.test b/mysql-test/suite/sys_vars/t/default_master_connection_basic.test index 627a236aaa7..ae91bc46e1a 100644 --- a/mysql-test/suite/sys_vars/t/default_master_connection_basic.test +++ b/mysql-test/suite/sys_vars/t/default_master_connection_basic.test @@ -102,12 +102,8 @@ SELECT @@local.default_master_connection = @@session.default_master_connection; SET default_master_connection = 'foo'; SELECT @@default_master_connection; ---Error ER_PARSE_ERROR -SET local.default_master_connection = 'foo'; --Error ER_UNKNOWN_TABLE SELECT local.default_master_connection; ---Error ER_PARSE_ERROR -SET session.default_master_connection = 'foo'; --Error ER_UNKNOWN_TABLE SELECT session.default_master_connection; --Error ER_BAD_FIELD_ERROR diff --git a/mysql-test/suite/sys_vars/t/default_week_format_basic.test b/mysql-test/suite/sys_vars/t/default_week_format_basic.test index e609cdc53f5..592379bae8c 100644 --- a/mysql-test/suite/sys_vars/t/default_week_format_basic.test +++ b/mysql-test/suite/sys_vars/t/default_week_format_basic.test @@ -170,12 +170,8 @@ SELECT @@local.default_week_format = @@session.default_week_format; SET default_week_format = 1; SELECT @@default_week_format; ---Error ER_PARSE_ERROR -SET local.default_week_format = 1; --Error ER_UNKNOWN_TABLE SELECT local.default_week_format; ---Error ER_PARSE_ERROR -SET session.default_week_format = 1; --Error ER_UNKNOWN_TABLE SELECT session.default_week_format; --Error ER_BAD_FIELD_ERROR diff --git a/mysql-test/suite/sys_vars/t/delayed_insert_limit_basic.test b/mysql-test/suite/sys_vars/t/delayed_insert_limit_basic.test index 0c9a7d1ddb8..3eb345dc5c3 100644 --- a/mysql-test/suite/sys_vars/t/delayed_insert_limit_basic.test +++ b/mysql-test/suite/sys_vars/t/delayed_insert_limit_basic.test @@ -141,12 +141,8 @@ SELECT @@delayed_insert_limit = @@global.delayed_insert_limit; --Error ER_GLOBAL_VARIABLE SET delayed_insert_limit = 1; SELECT @@delayed_insert_limit; ---Error ER_PARSE_ERROR -SET local.delayed_insert_limit = 1; --Error ER_UNKNOWN_TABLE SELECT local.delayed_insert_limit; ---Error ER_PARSE_ERROR -SET global.delayed_insert_limit = 1; --Error ER_UNKNOWN_TABLE SELECT global.delayed_insert_limit; --Error ER_BAD_FIELD_ERROR diff --git a/mysql-test/suite/sys_vars/t/delayed_insert_timeout_basic.test b/mysql-test/suite/sys_vars/t/delayed_insert_timeout_basic.test index 2486ff5800f..79521924290 100644 --- a/mysql-test/suite/sys_vars/t/delayed_insert_timeout_basic.test +++ b/mysql-test/suite/sys_vars/t/delayed_insert_timeout_basic.test @@ -140,12 +140,8 @@ SELECT @@delayed_insert_timeout = @@global.delayed_insert_timeout; --Error 1229 SET delayed_insert_timeout = 1; SELECT @@delayed_insert_timeout; ---Error 1064 -SET local.delayed_insert_timeout = 1; --Error 1109 SELECT local.delayed_insert_timeout; ---Error 1064 -SET global.delayed_insert_timeout = 1; --Error 1109 SELECT global.delayed_insert_timeout; --Error 1054 diff --git a/mysql-test/suite/sys_vars/t/delayed_queue_size_basic.test b/mysql-test/suite/sys_vars/t/delayed_queue_size_basic.test index e8b5ab31224..a0aae63c8b8 100644 --- a/mysql-test/suite/sys_vars/t/delayed_queue_size_basic.test +++ b/mysql-test/suite/sys_vars/t/delayed_queue_size_basic.test @@ -136,12 +136,8 @@ SELECT @@delayed_queue_size = @@global.delayed_queue_size; --Error 1229 SET delayed_queue_size = 1; SELECT @@delayed_queue_size; ---Error ER_PARSE_ERROR -SET local.delayed_queue_size = 1; --Error ER_UNKNOWN_TABLE SELECT local.delayed_queue_size; ---Error ER_PARSE_ERROR -SET global.delayed_queue_size = 1; --Error ER_UNKNOWN_TABLE SELECT global.delayed_queue_size; --Error ER_BAD_FIELD_ERROR diff --git a/mysql-test/suite/sys_vars/t/div_precision_increment_basic.test b/mysql-test/suite/sys_vars/t/div_precision_increment_basic.test index 97f0e0eab81..6399288cafc 100644 --- a/mysql-test/suite/sys_vars/t/div_precision_increment_basic.test +++ b/mysql-test/suite/sys_vars/t/div_precision_increment_basic.test @@ -179,12 +179,8 @@ SELECT @@local.div_precision_increment = @@session.div_precision_increment; SET div_precision_increment = 1; SELECT @@div_precision_increment; ---Error ER_PARSE_ERROR -SET local.div_precision_increment = 1; --Error ER_UNKNOWN_TABLE SELECT local.div_precision_increment; ---Error ER_PARSE_ERROR -SET session.div_precision_increment = 1; --Error ER_UNKNOWN_TABLE SELECT session.div_precision_increment; --Error ER_BAD_FIELD_ERROR diff --git a/mysql-test/suite/sys_vars/t/event_scheduler_basic.test b/mysql-test/suite/sys_vars/t/event_scheduler_basic.test index 2e6aa3cba5c..acd7d4bd8a8 100644 --- a/mysql-test/suite/sys_vars/t/event_scheduler_basic.test +++ b/mysql-test/suite/sys_vars/t/event_scheduler_basic.test @@ -147,12 +147,8 @@ SELECT @@event_scheduler = @@global.event_scheduler; ####################################################################### --Error ER_GLOBAL_VARIABLE SET event_scheduler = ON; ---Error ER_PARSE_ERROR -SET local.event_scheduler = OFF; --Error ER_UNKNOWN_TABLE SELECT local.event_scheduler; ---Error ER_PARSE_ERROR -SET global.event_scheduler = ON; --Error ER_UNKNOWN_TABLE SELECT global.event_scheduler; --Error ER_BAD_FIELD_ERROR diff --git a/mysql-test/suite/sys_vars/t/expire_logs_days_basic.test b/mysql-test/suite/sys_vars/t/expire_logs_days_basic.test index f19ab922c72..fa57cec38c6 100644 --- a/mysql-test/suite/sys_vars/t/expire_logs_days_basic.test +++ b/mysql-test/suite/sys_vars/t/expire_logs_days_basic.test @@ -153,12 +153,8 @@ SELECT @@expire_logs_days = @@global.expire_logs_days; --Error ER_GLOBAL_VARIABLE SET expire_logs_days = 1; SELECT @@expire_logs_days; ---Error ER_PARSE_ERROR -SET local.expire_logs_days = 1; --Error ER_UNKNOWN_TABLE SELECT local.expire_logs_days; ---Error ER_PARSE_ERROR -SET global.expire_logs_days = 1; --Error ER_UNKNOWN_TABLE SELECT global.expire_logs_days; --Error ER_BAD_FIELD_ERROR diff --git a/mysql-test/suite/sys_vars/t/flush_basic.test b/mysql-test/suite/sys_vars/t/flush_basic.test index 4eb821e9af1..842d0caa581 100644 --- a/mysql-test/suite/sys_vars/t/flush_basic.test +++ b/mysql-test/suite/sys_vars/t/flush_basic.test @@ -149,8 +149,6 @@ SELECT @@flush = @@global.flush; --Error ER_GLOBAL_VARIABLE SET flush = 1; ---Error ER_PARSE_ERROR -SET global.flush = 1; --Error ER_UNKNOWN_TABLE SELECT global.flush; --Error ER_BAD_FIELD_ERROR diff --git a/mysql-test/suite/sys_vars/t/general_log_basic.test b/mysql-test/suite/sys_vars/t/general_log_basic.test index 6a1d00f1b6f..b41185e2049 100644 --- a/mysql-test/suite/sys_vars/t/general_log_basic.test +++ b/mysql-test/suite/sys_vars/t/general_log_basic.test @@ -143,12 +143,8 @@ SELECT @@general_log = @@global.general_log; ####################################################################### --Error ER_GLOBAL_VARIABLE SET general_log = ON; ---Error ER_PARSE_ERROR -SET local.general_log = OFF; --Error ER_UNKNOWN_TABLE SELECT local.general_log; ---Error ER_PARSE_ERROR -SET global.general_log = ON; --Error ER_UNKNOWN_TABLE SELECT global.general_log; --Error ER_BAD_FIELD_ERROR diff --git a/mysql-test/suite/sys_vars/t/identity_basic.test b/mysql-test/suite/sys_vars/t/identity_basic.test index 2ddec32a621..f88d2651046 100644 --- a/mysql-test/suite/sys_vars/t/identity_basic.test +++ b/mysql-test/suite/sys_vars/t/identity_basic.test @@ -163,12 +163,8 @@ SELECT @@session.identity = @@local.identity; SET identity = 1; SELECT @@identity; ---Error ER_PARSE_ERROR -SET local.identity = 1; --Error ER_UNKNOWN_TABLE SELECT local.identity; ---Error ER_PARSE_ERROR -SET session.identity = 1; --Error ER_UNKNOWN_TABLE SELECT session.identity; --Error ER_BAD_FIELD_ERROR diff --git a/mysql-test/suite/sys_vars/t/insert_id_basic.test b/mysql-test/suite/sys_vars/t/insert_id_basic.test index c9d3e1f4e52..36272e99617 100644 --- a/mysql-test/suite/sys_vars/t/insert_id_basic.test +++ b/mysql-test/suite/sys_vars/t/insert_id_basic.test @@ -164,12 +164,8 @@ SELECT @@session.insert_id = @@local.insert_id; SET insert_id = 1; SELECT @@insert_id; ---Error ER_PARSE_ERROR -SET local.insert_id = 1; --Error ER_UNKNOWN_TABLE SELECT local.insert_id; ---Error ER_PARSE_ERROR -SET session.insert_id = 1; --Error ER_UNKNOWN_TABLE SELECT session.insert_id; --Error ER_BAD_FIELD_ERROR diff --git a/mysql-test/suite/sys_vars/t/key_buffer_size_basic.test b/mysql-test/suite/sys_vars/t/key_buffer_size_basic.test index 354c65490a4..a737b30ac97 100644 --- a/mysql-test/suite/sys_vars/t/key_buffer_size_basic.test +++ b/mysql-test/suite/sys_vars/t/key_buffer_size_basic.test @@ -128,12 +128,8 @@ SELECT @@key_buffer_size = @@global.key_buffer_size; --Error ER_GLOBAL_VARIABLE SET key_buffer_size = 8 ; ---Error ER_PARSE_ERROR -SET local.key_buffer_size = 10; --Error ER_UNKNOWN_TABLE SELECT local.key_buffer_size; ---Error ER_PARSE_ERROR -SET global.key_buffer_size = 10; --Error ER_UNKNOWN_TABLE SELECT global.key_buffer_size; --Error ER_BAD_FIELD_ERROR diff --git a/mysql-test/suite/sys_vars/t/key_cache_age_threshold_basic.test b/mysql-test/suite/sys_vars/t/key_cache_age_threshold_basic.test index e0970016577..0d47dc3f613 100644 --- a/mysql-test/suite/sys_vars/t/key_cache_age_threshold_basic.test +++ b/mysql-test/suite/sys_vars/t/key_cache_age_threshold_basic.test @@ -148,12 +148,8 @@ SELECT @@key_cache_age_threshold = @@global.key_cache_age_threshold; --Error ER_GLOBAL_VARIABLE SET key_cache_age_threshold = 8000; SELECT @@key_cache_age_threshold; ---Error ER_PARSE_ERROR -SET local.key_cache_age_threshold = 10; --Error ER_UNKNOWN_TABLE SELECT local.key_cache_age_threshold; ---Error ER_PARSE_ERROR -SET global.key_cache_age_threshold = 10; --Error ER_UNKNOWN_TABLE SELECT global.key_cache_age_threshold; --Error ER_BAD_FIELD_ERROR diff --git a/mysql-test/suite/sys_vars/t/key_cache_block_size_basic.test b/mysql-test/suite/sys_vars/t/key_cache_block_size_basic.test index 99a3c5dc327..6e84b121dbd 100644 --- a/mysql-test/suite/sys_vars/t/key_cache_block_size_basic.test +++ b/mysql-test/suite/sys_vars/t/key_cache_block_size_basic.test @@ -152,12 +152,8 @@ SELECT @@key_cache_block_size = @@global.key_cache_block_size; --Error ER_GLOBAL_VARIABLE SET key_cache_block_size = 8000; SELECT @@key_cache_block_size; ---Error ER_PARSE_ERROR -SET local.key_cache_block_size = 10; --Error ER_UNKNOWN_TABLE SELECT local.key_cache_block_size; ---Error ER_PARSE_ERROR -SET global.key_cache_block_size = 10; --Error ER_UNKNOWN_TABLE SELECT global.key_cache_block_size; --Error ER_BAD_FIELD_ERROR diff --git a/mysql-test/suite/sys_vars/t/key_cache_division_limit_basic.test b/mysql-test/suite/sys_vars/t/key_cache_division_limit_basic.test index dd41e4d37a0..a1770d62e57 100644 --- a/mysql-test/suite/sys_vars/t/key_cache_division_limit_basic.test +++ b/mysql-test/suite/sys_vars/t/key_cache_division_limit_basic.test @@ -153,12 +153,8 @@ SELECT @@key_cache_division_limit = @@global.key_cache_division_limit; --Error ER_GLOBAL_VARIABLE SET key_cache_division_limit = 80; SELECT @@key_cache_division_limit; ---Error ER_PARSE_ERROR -SET local.key_cache_division_limit = 10; --Error ER_UNKNOWN_TABLE SELECT local.key_cache_division_limit; ---Error ER_PARSE_ERROR -SET global.key_cache_division_limit = 10; --Error ER_UNKNOWN_TABLE SELECT global.key_cache_division_limit; --Error ER_BAD_FIELD_ERROR diff --git a/mysql-test/suite/sys_vars/t/key_cache_file_hash_size_basic.test b/mysql-test/suite/sys_vars/t/key_cache_file_hash_size_basic.test index deebe708d3d..b8caa5bbf70 100644 --- a/mysql-test/suite/sys_vars/t/key_cache_file_hash_size_basic.test +++ b/mysql-test/suite/sys_vars/t/key_cache_file_hash_size_basic.test @@ -143,12 +143,8 @@ SELECT @@key_cache_file_hash_size = @@global.key_cache_file_hash_size; --Error ER_GLOBAL_VARIABLE SET key_cache_file_hash_size = 8000; SELECT @@key_cache_file_hash_size; ---Error ER_PARSE_ERROR -SET local.key_cache_file_hash_size = 10; --Error ER_UNKNOWN_TABLE SELECT local.key_cache_file_hash_size; ---Error ER_PARSE_ERROR -SET global.key_cache_file_hash_size = 10; --Error ER_UNKNOWN_TABLE SELECT global.key_cache_file_hash_size; --Error ER_BAD_FIELD_ERROR diff --git a/mysql-test/suite/sys_vars/t/lc_time_names_basic.test b/mysql-test/suite/sys_vars/t/lc_time_names_basic.test index c66bdc40a02..7f748bec2c0 100644 --- a/mysql-test/suite/sys_vars/t/lc_time_names_basic.test +++ b/mysql-test/suite/sys_vars/t/lc_time_names_basic.test @@ -56,9 +56,6 @@ SELECT lc_time_names; # assign value without @@ SET lc_time_names=ar_AE; SELECT @@session.lc_time_names; -# assign global variable without @@ ---Error ER_PARSE_ERROR -SET global.lc_time_names=ar_AE; # using another syntax for accessing session variable SET session lc_time_names=ar_AE; # accessing variable with scope the wrong way diff --git a/mysql-test/suite/sys_vars/t/local_infile_basic.test b/mysql-test/suite/sys_vars/t/local_infile_basic.test index 731eac42541..4430fa32f0a 100644 --- a/mysql-test/suite/sys_vars/t/local_infile_basic.test +++ b/mysql-test/suite/sys_vars/t/local_infile_basic.test @@ -154,8 +154,6 @@ SELECT @@local_infile = @@global.local_infile; --Error ER_GLOBAL_VARIABLE SET local_infile = 1; SELECT @@local_infile; ---Error ER_PARSE_ERROR -SET global.local_infile = 1; --Error ER_UNKNOWN_TABLE SELECT global.local_infile; --Error ER_BAD_FIELD_ERROR diff --git a/mysql-test/suite/sys_vars/t/max_binlog_cache_size_basic.test b/mysql-test/suite/sys_vars/t/max_binlog_cache_size_basic.test index 710299f053c..974ec95ca5c 100644 --- a/mysql-test/suite/sys_vars/t/max_binlog_cache_size_basic.test +++ b/mysql-test/suite/sys_vars/t/max_binlog_cache_size_basic.test @@ -165,12 +165,8 @@ SELECT @@max_binlog_cache_size = @@global.max_binlog_cache_size; --Error ER_GLOBAL_VARIABLE SET max_binlog_cache_size = 6000; SELECT @@max_binlog_cache_size; ---Error ER_PARSE_ERROR -SET local.max_binlog_cache_size = 7000; --Error ER_UNKNOWN_TABLE SELECT local.max_binlog_cache_size; ---Error ER_PARSE_ERROR -SET global.max_binlog_cache_size = 8000; --Error ER_UNKNOWN_TABLE SELECT global.max_binlog_cache_size; --Error ER_BAD_FIELD_ERROR diff --git a/mysql-test/suite/sys_vars/t/max_binlog_size_basic.test b/mysql-test/suite/sys_vars/t/max_binlog_size_basic.test index 4d2574a7890..22e8808ed8c 100644 --- a/mysql-test/suite/sys_vars/t/max_binlog_size_basic.test +++ b/mysql-test/suite/sys_vars/t/max_binlog_size_basic.test @@ -153,12 +153,8 @@ SELECT @@max_binlog_size = @@global.max_binlog_size; --Error ER_GLOBAL_VARIABLE SET max_binlog_size = 6000; SELECT @@max_binlog_size; ---Error ER_PARSE_ERROR -SET local.max_binlog_size = 7000; --Error ER_UNKNOWN_TABLE SELECT local.max_binlog_size; ---Error ER_PARSE_ERROR -SET global.max_binlog_size = 8000; --Error ER_UNKNOWN_TABLE SELECT global.max_binlog_size; --Error ER_BAD_FIELD_ERROR diff --git a/mysql-test/suite/sys_vars/t/max_binlog_stmt_cache_size_basic.test b/mysql-test/suite/sys_vars/t/max_binlog_stmt_cache_size_basic.test index 3c2f6f6d391..ba528e268ec 100644 --- a/mysql-test/suite/sys_vars/t/max_binlog_stmt_cache_size_basic.test +++ b/mysql-test/suite/sys_vars/t/max_binlog_stmt_cache_size_basic.test @@ -166,12 +166,8 @@ SELECT @@max_binlog_stmt_cache_size = @@global.max_binlog_stmt_cache_size; --Error ER_GLOBAL_VARIABLE SET max_binlog_stmt_cache_size = 6000; SELECT @@max_binlog_stmt_cache_size; ---Error ER_PARSE_ERROR -SET local.max_binlog_stmt_cache_size = 7000; --Error ER_UNKNOWN_TABLE SELECT local.max_binlog_stmt_cache_size; ---Error ER_PARSE_ERROR -SET global.max_binlog_stmt_cache_size = 8000; --Error ER_UNKNOWN_TABLE SELECT global.max_binlog_stmt_cache_size; --Error ER_BAD_FIELD_ERROR diff --git a/mysql-test/suite/sys_vars/t/max_connect_errors_basic.test b/mysql-test/suite/sys_vars/t/max_connect_errors_basic.test index ffad23f6ba7..cc860e92fbb 100644 --- a/mysql-test/suite/sys_vars/t/max_connect_errors_basic.test +++ b/mysql-test/suite/sys_vars/t/max_connect_errors_basic.test @@ -152,12 +152,8 @@ SELECT @@max_connect_errors = @@global.max_connect_errors; --Error ER_GLOBAL_VARIABLE SET max_connect_errors = 6000; SELECT @@max_connect_errors; ---Error ER_PARSE_ERROR -SET local.max_connect_errors = 7000; --Error ER_UNKNOWN_TABLE SELECT local.max_connect_errors; ---Error ER_PARSE_ERROR -SET global.max_connect_errors = 8000; --Error ER_UNKNOWN_TABLE SELECT global.max_connect_errors; --Error ER_BAD_FIELD_ERROR diff --git a/mysql-test/suite/sys_vars/t/max_connections_basic.test b/mysql-test/suite/sys_vars/t/max_connections_basic.test index 346f7d8f460..de259b32c17 100644 --- a/mysql-test/suite/sys_vars/t/max_connections_basic.test +++ b/mysql-test/suite/sys_vars/t/max_connections_basic.test @@ -153,12 +153,8 @@ SELECT @@max_connections = @@global.max_connections; --Error ER_GLOBAL_VARIABLE SET max_connections = 6000; SELECT @@max_connections; ---Error ER_PARSE_ERROR -SET local.max_connections = 7000; --Error ER_UNKNOWN_TABLE SELECT local.max_connections; ---Error ER_PARSE_ERROR -SET global.max_connections = 8000; --Error ER_UNKNOWN_TABLE SELECT global.max_connections; --Error ER_BAD_FIELD_ERROR diff --git a/mysql-test/suite/sys_vars/t/max_prepared_stmt_count_basic.test b/mysql-test/suite/sys_vars/t/max_prepared_stmt_count_basic.test index 5bf5d9c8834..a1961a61a40 100644 --- a/mysql-test/suite/sys_vars/t/max_prepared_stmt_count_basic.test +++ b/mysql-test/suite/sys_vars/t/max_prepared_stmt_count_basic.test @@ -158,12 +158,8 @@ SELECT @@max_prepared_stmt_count = @@global.max_prepared_stmt_count; --Error ER_GLOBAL_VARIABLE SET max_prepared_stmt_count = 6000; SELECT @@max_prepared_stmt_count; ---Error ER_PARSE_ERROR -SET local.max_prepared_stmt_count = 7000; --Error ER_UNKNOWN_TABLE SELECT local.max_prepared_stmt_count; ---Error ER_PARSE_ERROR -SET global.max_prepared_stmt_count = 8000; --Error ER_UNKNOWN_TABLE SELECT global.max_prepared_stmt_count; --Error ER_BAD_FIELD_ERROR diff --git a/mysql-test/suite/sys_vars/t/max_relay_log_size_basic.test b/mysql-test/suite/sys_vars/t/max_relay_log_size_basic.test index 05d0fd1be82..de7cc395daf 100644 --- a/mysql-test/suite/sys_vars/t/max_relay_log_size_basic.test +++ b/mysql-test/suite/sys_vars/t/max_relay_log_size_basic.test @@ -150,12 +150,8 @@ SELECT @@max_relay_log_size = @@global.max_relay_log_size; SET max_relay_log_size = 6000; SELECT @@max_relay_log_size; ---Error ER_PARSE_ERROR -SET local.max_relay_log_size = 7000; --Error ER_UNKNOWN_TABLE SELECT local.max_relay_log_size; ---Error ER_PARSE_ERROR -SET global.max_relay_log_size = 8000; --Error ER_UNKNOWN_TABLE SELECT global.max_relay_log_size; --Error ER_BAD_FIELD_ERROR diff --git a/mysql-test/suite/sys_vars/t/myisam_stats_method_basic.test b/mysql-test/suite/sys_vars/t/myisam_stats_method_basic.test index f70431b5580..6fecee3f32d 100644 --- a/mysql-test/suite/sys_vars/t/myisam_stats_method_basic.test +++ b/mysql-test/suite/sys_vars/t/myisam_stats_method_basic.test @@ -178,11 +178,6 @@ SELECT @@global.myisam_stats_method; SET myisam_stats_method = 'nulls_equal'; ---Error ER_PARSE_ERROR -SET session.myisam_stats_method = 'nulls_equal'; ---Error ER_PARSE_ERROR -SET global.myisam_stats_method = 'nulls_equal'; - SET session myisam_stats_method = 'nulls_equal'; SELECT @@myisam_stats_method; diff --git a/mysql-test/suite/sys_vars/t/mysql56_temporal_format_basic.test b/mysql-test/suite/sys_vars/t/mysql56_temporal_format_basic.test index d0de9202d3f..f6def41fa56 100644 --- a/mysql-test/suite/sys_vars/t/mysql56_temporal_format_basic.test +++ b/mysql-test/suite/sys_vars/t/mysql56_temporal_format_basic.test @@ -144,8 +144,6 @@ SELECT @@mysql56_temporal_format = @@global.mysql56_temporal_format; --Error ER_GLOBAL_VARIABLE SET mysql56_temporal_format = 1; ---Error ER_PARSE_ERROR -SET global.mysql56_temporal_format = 1; --Error ER_UNKNOWN_TABLE SELECT global.mysql56_temporal_format; --Error ER_BAD_FIELD_ERROR diff --git a/mysql-test/suite/sys_vars/t/old_mode_basic.test b/mysql-test/suite/sys_vars/t/old_mode_basic.test index 93a93960836..088f85c48bd 100644 --- a/mysql-test/suite/sys_vars/t/old_mode_basic.test +++ b/mysql-test/suite/sys_vars/t/old_mode_basic.test @@ -197,11 +197,6 @@ SELECT @@global.old_mode; SET old_mode = 'NO_PROGRESS_INFO'; ---Error ER_PARSE_ERROR -SET session.old_mode = 'ANSI'; ---Error ER_PARSE_ERROR -SET global.old_mode = 'ANSI'; - SET session old_mode = 1; SELECT @@old_mode; diff --git a/mysql-test/suite/sys_vars/t/query_cache_limit_basic.test b/mysql-test/suite/sys_vars/t/query_cache_limit_basic.test index c94ba3a52dd..98baa17d421 100644 --- a/mysql-test/suite/sys_vars/t/query_cache_limit_basic.test +++ b/mysql-test/suite/sys_vars/t/query_cache_limit_basic.test @@ -152,12 +152,8 @@ SELECT @@query_cache_limit = @@global.query_cache_limit; --Error ER_GLOBAL_VARIABLE SET query_cache_limit = 1; SELECT @@query_cache_limit; ---Error ER_PARSE_ERROR -SET local.query_cache_limit = 1; --Error ER_UNKNOWN_TABLE SELECT local.query_cache_limit; ---Error ER_PARSE_ERROR -SET global.query_cache_limit = 1; --Error ER_UNKNOWN_TABLE SELECT global.query_cache_limit; --Error ER_BAD_FIELD_ERROR diff --git a/mysql-test/suite/sys_vars/t/query_cache_min_res_unit_basic.test b/mysql-test/suite/sys_vars/t/query_cache_min_res_unit_basic.test index 9276a987dfb..b7916e73fa2 100644 --- a/mysql-test/suite/sys_vars/t/query_cache_min_res_unit_basic.test +++ b/mysql-test/suite/sys_vars/t/query_cache_min_res_unit_basic.test @@ -159,12 +159,8 @@ SELECT @@query_cache_min_res_unit = @@global.query_cache_min_res_unit; --Error ER_GLOBAL_VARIABLE SET query_cache_min_res_unit = 1; SELECT @@query_cache_min_res_unit; ---Error ER_PARSE_ERROR -SET local.query_cache_min_res_unit = 1; --Error ER_UNKNOWN_TABLE SELECT local.query_cache_min_res_unit; ---Error ER_PARSE_ERROR -SET global.query_cache_min_res_unit = 1; --Error ER_UNKNOWN_TABLE SELECT global.query_cache_min_res_unit; --Error ER_BAD_FIELD_ERROR diff --git a/mysql-test/suite/sys_vars/t/query_cache_size_basic.test b/mysql-test/suite/sys_vars/t/query_cache_size_basic.test index 2a589ae3771..352cc29a445 100644 --- a/mysql-test/suite/sys_vars/t/query_cache_size_basic.test +++ b/mysql-test/suite/sys_vars/t/query_cache_size_basic.test @@ -142,12 +142,8 @@ SELECT @@query_cache_size = @@global.query_cache_size; --Error ER_GLOBAL_VARIABLE SET query_cache_size = 1; SELECT @@query_cache_size; ---Error ER_PARSE_ERROR -SET local.query_cache_size = 1; --Error ER_UNKNOWN_TABLE SELECT local.query_cache_size; ---Error ER_PARSE_ERROR -SET global.query_cache_size = 1; --Error ER_UNKNOWN_TABLE SELECT global.query_cache_size; --Error ER_BAD_FIELD_ERROR diff --git a/mysql-test/suite/sys_vars/t/read_only_basic.test b/mysql-test/suite/sys_vars/t/read_only_basic.test index 0f77e983f92..3ef35020f01 100644 --- a/mysql-test/suite/sys_vars/t/read_only_basic.test +++ b/mysql-test/suite/sys_vars/t/read_only_basic.test @@ -146,12 +146,8 @@ SELECT @@read_only = @@global.read_only; --Error ER_GLOBAL_VARIABLE SET read_only = 1; SELECT @@read_only; ---Error ER_PARSE_ERROR -SET local.read_only = 1; --Error ER_UNKNOWN_TABLE SELECT local.read_only; ---Error ER_PARSE_ERROR -SET global.read_only = 1; --Error ER_UNKNOWN_TABLE SELECT global.read_only; --Error ER_BAD_FIELD_ERROR diff --git a/mysql-test/suite/sys_vars/t/relay_log_purge_basic.test b/mysql-test/suite/sys_vars/t/relay_log_purge_basic.test index 081b79ebb73..dd211bb10ea 100644 --- a/mysql-test/suite/sys_vars/t/relay_log_purge_basic.test +++ b/mysql-test/suite/sys_vars/t/relay_log_purge_basic.test @@ -143,8 +143,6 @@ SELECT @@relay_log_purge = @@global.relay_log_purge; --Error ER_GLOBAL_VARIABLE SET relay_log_purge = 1; ---Error ER_PARSE_ERROR -SET global.relay_log_purge = 1; --Error ER_UNKNOWN_TABLE SELECT global.relay_log_purge; --Error ER_BAD_FIELD_ERROR diff --git a/mysql-test/suite/sys_vars/t/slave_max_allowed_packet_basic.test b/mysql-test/suite/sys_vars/t/slave_max_allowed_packet_basic.test index 4caaae84906..821c1855b03 100644 --- a/mysql-test/suite/sys_vars/t/slave_max_allowed_packet_basic.test +++ b/mysql-test/suite/sys_vars/t/slave_max_allowed_packet_basic.test @@ -152,12 +152,8 @@ SELECT @@slave_max_allowed_packet = @@global.slave_max_allowed_packet; --Error ER_GLOBAL_VARIABLE SET slave_max_allowed_packet = 6000; SELECT @@slave_max_allowed_packet; ---Error ER_PARSE_ERROR -SET local.slave_max_allowed_packet = 7000; --Error ER_UNKNOWN_TABLE SELECT local.slave_max_allowed_packet; ---Error ER_PARSE_ERROR -SET global.slave_max_allowed_packet = 8000; --Error ER_UNKNOWN_TABLE SELECT global.slave_max_allowed_packet; --Error ER_BAD_FIELD_ERROR diff --git a/mysql-test/suite/sys_vars/t/slow_launch_time_basic.test b/mysql-test/suite/sys_vars/t/slow_launch_time_basic.test index bedcb6201b1..71b25185549 100644 --- a/mysql-test/suite/sys_vars/t/slow_launch_time_basic.test +++ b/mysql-test/suite/sys_vars/t/slow_launch_time_basic.test @@ -151,12 +151,8 @@ SELECT @@slow_launch_time = @@global.slow_launch_time; --Error ER_GLOBAL_VARIABLE SET slow_launch_time = 1; SELECT @@slow_launch_time; ---Error ER_PARSE_ERROR -SET local.slow_launch_time = 1; --Error ER_UNKNOWN_TABLE SELECT local.slow_launch_time; ---Error ER_PARSE_ERROR -SET global.slow_launch_time = 1; --Error ER_UNKNOWN_TABLE SELECT global.slow_launch_time; --Error ER_BAD_FIELD_ERROR diff --git a/mysql-test/suite/sys_vars/t/slow_query_log_basic.test b/mysql-test/suite/sys_vars/t/slow_query_log_basic.test index b429f9f5cea..3d58902ab8d 100644 --- a/mysql-test/suite/sys_vars/t/slow_query_log_basic.test +++ b/mysql-test/suite/sys_vars/t/slow_query_log_basic.test @@ -145,12 +145,8 @@ SELECT @@slow_query_log = @@global.slow_query_log; ###################################################################### # Check if slow_query_log can be accessed with and without @@ sign # ###################################################################### ---Error ER_PARSE_ERROR -SET local.slow_query_log = OFF; --Error ER_UNKNOWN_TABLE SELECT local.slow_query_log; ---Error ER_PARSE_ERROR -SET global.slow_query_log = ON; --Error ER_UNKNOWN_TABLE SELECT global.slow_query_log; --Error ER_BAD_FIELD_ERROR diff --git a/mysql-test/suite/sys_vars/t/sql_mode_basic.test b/mysql-test/suite/sys_vars/t/sql_mode_basic.test index 83f938925d5..ad1c722303c 100644 --- a/mysql-test/suite/sys_vars/t/sql_mode_basic.test +++ b/mysql-test/suite/sys_vars/t/sql_mode_basic.test @@ -336,11 +336,6 @@ SELECT @@global.sql_mode; SET sql_mode = 'ANSI'; ---Error ER_PARSE_ERROR -SET session.sql_mode = 'ANSI'; ---Error ER_PARSE_ERROR -SET global.sql_mode = 'ANSI'; - SET session sql_mode = 1; SELECT @@sql_mode; diff --git a/mysql-test/suite/sys_vars/t/sync_binlog_basic.test b/mysql-test/suite/sys_vars/t/sync_binlog_basic.test index 71a35a30c58..5b7c5f37191 100644 --- a/mysql-test/suite/sys_vars/t/sync_binlog_basic.test +++ b/mysql-test/suite/sys_vars/t/sync_binlog_basic.test @@ -131,12 +131,8 @@ WHERE VARIABLE_NAME='sync_binlog'; --Error ER_GLOBAL_VARIABLE SET sync_binlog = 1; SELECT @@sync_binlog; ---Error ER_PARSE_ERROR -SET local.sync_binlog = 1; --Error ER_UNKNOWN_TABLE SELECT local.sync_binlog; ---Error ER_PARSE_ERROR -SET global.sync_binlog = 1; --Error ER_UNKNOWN_TABLE SELECT global.sync_binlog; --Error ER_BAD_FIELD_ERROR diff --git a/mysql-test/suite/sys_vars/t/sync_frm_basic.test b/mysql-test/suite/sys_vars/t/sync_frm_basic.test index d9dcffb6318..6fb9e03d572 100644 --- a/mysql-test/suite/sys_vars/t/sync_frm_basic.test +++ b/mysql-test/suite/sys_vars/t/sync_frm_basic.test @@ -144,8 +144,6 @@ SELECT @@sync_frm = @@global.sync_frm; --Error ER_GLOBAL_VARIABLE SET sync_frm = 1; SELECT @@sync_frm; ---Error ER_PARSE_ERROR -SET global.sync_frm = 1; --Error ER_UNKNOWN_TABLE SELECT global.sync_frm; --Error ER_BAD_FIELD_ERROR diff --git a/mysql-test/suite/sys_vars/t/table_definition_cache_basic.test b/mysql-test/suite/sys_vars/t/table_definition_cache_basic.test index 69f29108645..dc0903c5d40 100644 --- a/mysql-test/suite/sys_vars/t/table_definition_cache_basic.test +++ b/mysql-test/suite/sys_vars/t/table_definition_cache_basic.test @@ -137,8 +137,6 @@ SELECT @@table_definition_cache = @@global.table_definition_cache; --Error ER_GLOBAL_VARIABLE SET table_definition_cache = 1; ---Error ER_PARSE_ERROR -SET global.table_definition_cache = 1; --Error ER_UNKNOWN_TABLE SELECT global.table_definition_cache; --Error ER_BAD_FIELD_ERROR diff --git a/mysql-test/suite/sys_vars/t/table_open_cache_basic.test b/mysql-test/suite/sys_vars/t/table_open_cache_basic.test index 7d2549cd87f..d2450e9586e 100644 --- a/mysql-test/suite/sys_vars/t/table_open_cache_basic.test +++ b/mysql-test/suite/sys_vars/t/table_open_cache_basic.test @@ -152,8 +152,6 @@ SELECT @@table_open_cache = @@global.table_open_cache ; --Error ER_GLOBAL_VARIABLE SET table_open_cache = 8; ---Error ER_PARSE_ERROR -SET global.table_open_cache = 10; --Error ER_UNKNOWN_TABLE SELECT global.table_open_cache ; --Error ER_BAD_FIELD_ERROR diff --git a/mysql-test/suite/sys_vars/t/tx_isolation_basic.test b/mysql-test/suite/sys_vars/t/tx_isolation_basic.test index 0a15aa08b6b..5b484cb9b1b 100644 --- a/mysql-test/suite/sys_vars/t/tx_isolation_basic.test +++ b/mysql-test/suite/sys_vars/t/tx_isolation_basic.test @@ -189,10 +189,6 @@ SELECT @@global.tx_isolation; SET tx_isolation = 'REPEATABLE-READ'; ---Error ER_PARSE_ERROR -SET session.tx_isolation = 'REPEATABLE-READ'; ---Error ER_PARSE_ERROR -SET global.tx_isolation = 'REPEATABLE-READ'; #using SET SESSION|GLOBAL syntax SET session tx_isolation = 'REPEATABLE-READ'; SELECT @@tx_isolation;