diff options
Diffstat (limited to 'mysql-test/suite/sys_vars/t')
9 files changed, 35 insertions, 63 deletions
diff --git a/mysql-test/suite/sys_vars/t/innodb_checksum_algorithm_basic.test b/mysql-test/suite/sys_vars/t/innodb_checksum_algorithm_basic.test index bb0f3417f87..947007a5dd1 100644 --- a/mysql-test/suite/sys_vars/t/innodb_checksum_algorithm_basic.test +++ b/mysql-test/suite/sys_vars/t/innodb_checksum_algorithm_basic.test @@ -22,6 +22,12 @@ SELECT @@global.innodb_checksum_algorithm; SET GLOBAL innodb_checksum_algorithm = 'strict_none'; SELECT @@global.innodb_checksum_algorithm; +SET GLOBAL innodb_checksum_algorithm = 'full_crc32'; +SELECT @@global.innodb_checksum_algorithm; + +SET GLOBAL innodb_checksum_algorithm = 'strict_full_crc32'; +SELECT @@global.innodb_checksum_algorithm; + -- error ER_WRONG_VALUE_FOR_VAR SET GLOBAL innodb_checksum_algorithm = ''; SELECT @@global.innodb_checksum_algorithm; diff --git a/mysql-test/suite/sys_vars/t/innodb_instant_alter_column_allowed_basic.test b/mysql-test/suite/sys_vars/t/innodb_instant_alter_column_allowed_basic.test index 4ff84b42a3a..c9921b18f96 100644 --- a/mysql-test/suite/sys_vars/t/innodb_instant_alter_column_allowed_basic.test +++ b/mysql-test/suite/sys_vars/t/innodb_instant_alter_column_allowed_basic.test @@ -20,6 +20,8 @@ set global innodb_instant_alter_column_allowed=1.1; set global innodb_instant_alter_column_allowed=-1; select @@global.innodb_instant_alter_column_allowed; --error ER_WRONG_VALUE_FOR_VAR +set global innodb_instant_alter_column_allowed=3; +select @@global.innodb_instant_alter_column_allowed; set global innodb_instant_alter_column_allowed=2; select @@global.innodb_instant_alter_column_allowed; set global innodb_instant_alter_column_allowed=1; diff --git a/mysql-test/suite/sys_vars/t/myisam_stats_method_func.test b/mysql-test/suite/sys_vars/t/myisam_stats_method_func.test index 42335f00c41..5cb01958aff 100644 --- a/mysql-test/suite/sys_vars/t/myisam_stats_method_func.test +++ b/mysql-test/suite/sys_vars/t/myisam_stats_method_func.test @@ -65,6 +65,8 @@ SHOW INDEX FROM t1; --echo 'Set nulls to be equal' #===================================== SET myisam_stats_method = nulls_equal; +set @save_use_stat_tables= @@use_stat_tables; +set @@use_stat_tables= COMPLEMENTARY; INSERT INTO t1 VALUES (11); DELETE FROM t1 WHERE a = 11; @@ -75,6 +77,7 @@ DELETE FROM t1 WHERE a = 11; CHECK TABLE t1; SHOW INDEX FROM t1; + #===================================== --echo 'Set nulls to be ignored' #===================================== @@ -98,6 +101,7 @@ ANALYZE TABLE t1; SHOW INDEX FROM t1; SET myisam_stats_method = DEFAULT; +set @@use_stat_tables= @save_use_stat_tables; DROP TABLE t1; SET @@global.myisam_stats_method= @start_value; diff --git a/mysql-test/suite/sys_vars/t/shared_memory_base_name_basic.test b/mysql-test/suite/sys_vars/t/shared_memory_base_name_basic.test deleted file mode 100644 index da165564791..00000000000 --- a/mysql-test/suite/sys_vars/t/shared_memory_base_name_basic.test +++ /dev/null @@ -1,25 +0,0 @@ ---source include/windows.inc ---source include/not_embedded.inc -# -# only global -# ---replace_result $MYSQL_TMP_DIR MYSQL_TMP_DIR -select @@global.shared_memory_base_name; ---error ER_INCORRECT_GLOBAL_LOCAL_VAR -select @@session.shared_memory_base_name; ---replace_result $MYSQL_TMP_DIR MYSQL_TMP_DIR -show global variables like 'shared_memory_base_name'; ---replace_result $MYSQL_TMP_DIR MYSQL_TMP_DIR -show session variables like 'shared_memory_base_name'; ---replace_result $MYSQL_TMP_DIR MYSQL_TMP_DIR -select * from information_schema.global_variables where variable_name='shared_memory_base_name'; ---replace_result $MYSQL_TMP_DIR MYSQL_TMP_DIR -select * from information_schema.session_variables where variable_name='shared_memory_base_name'; - -# -# show that it's read-only -# ---error ER_INCORRECT_GLOBAL_LOCAL_VAR -set global shared_memory_base_name=1; ---error ER_INCORRECT_GLOBAL_LOCAL_VAR -set session shared_memory_base_name=1; diff --git a/mysql-test/suite/sys_vars/t/shared_memory_basic.test b/mysql-test/suite/sys_vars/t/shared_memory_basic.test deleted file mode 100644 index 57be4ef7ecd..00000000000 --- a/mysql-test/suite/sys_vars/t/shared_memory_basic.test +++ /dev/null @@ -1,20 +0,0 @@ ---source include/windows.inc ---source include/not_embedded.inc -# -# only global -# -select @@global.shared_memory; ---error ER_INCORRECT_GLOBAL_LOCAL_VAR -select @@session.shared_memory; -show global variables like 'shared_memory'; -show session variables like 'shared_memory'; -select * from information_schema.global_variables where variable_name='shared_memory'; -select * from information_schema.session_variables where variable_name='shared_memory'; - -# -# show that it's read-only -# ---error ER_INCORRECT_GLOBAL_LOCAL_VAR -set global shared_memory=1; ---error ER_INCORRECT_GLOBAL_LOCAL_VAR -set session shared_memory=1; 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 b4841ecd3ff..68be8ba969b 100644 --- a/mysql-test/suite/sys_vars/t/sql_mode_basic.test +++ b/mysql-test/suite/sys_vars/t/sql_mode_basic.test @@ -310,8 +310,14 @@ SELECT @@global.sql_mode; SET @@global.sql_mode = 17179869183; SELECT @@global.sql_mode; ---Error ER_WRONG_VALUE_FOR_VAR SET @@global.sql_mode = 17179869184; +SELECT @@global.sql_mode; + +SET @@global.sql_mode = 34359738367; +SELECT @@global.sql_mode; + +--Error ER_WRONG_VALUE_FOR_VAR +SET @@global.sql_mode = 34359738368; # use of decimal values diff --git a/mysql-test/suite/sys_vars/t/tcp_nodelay.test b/mysql-test/suite/sys_vars/t/tcp_nodelay.test new file mode 100644 index 00000000000..780bad68039 --- /dev/null +++ b/mysql-test/suite/sys_vars/t/tcp_nodelay.test @@ -0,0 +1,7 @@ +--source include/not_embedded.inc +# A smoke test for tcp_nodelay option +SET tcp_nodelay=0; +SET tcp_nodelay=1; +SET tcp_nodelay=default; +--error ER_INCORRECT_GLOBAL_LOCAL_VAR +SET GLOBAL tcp_nodelay=0; diff --git a/mysql-test/suite/sys_vars/t/wsrep_debug_basic.test b/mysql-test/suite/sys_vars/t/wsrep_debug_basic.test index 50576ff064e..165560bb25a 100644 --- a/mysql-test/suite/sys_vars/t/wsrep_debug_basic.test +++ b/mysql-test/suite/sys_vars/t/wsrep_debug_basic.test @@ -14,16 +14,16 @@ SELECT @@global.wsrep_debug; --echo # scope --error ER_INCORRECT_GLOBAL_LOCAL_VAR SELECT @@session.wsrep_debug; -SET @@global.wsrep_debug=OFF; +SET @@global.wsrep_debug=0; SELECT @@global.wsrep_debug; -SET @@global.wsrep_debug=ON; +SET @@global.wsrep_debug=1; SELECT @@global.wsrep_debug; --echo --echo # valid values -SET @@global.wsrep_debug='OFF'; +SET @@global.wsrep_debug=NONE; SELECT @@global.wsrep_debug; -SET @@global.wsrep_debug=ON; +SET @@global.wsrep_debug=SERVER; SELECT @@global.wsrep_debug; SET @@global.wsrep_debug=default; SELECT @@global.wsrep_debug; @@ -34,6 +34,8 @@ SELECT @@global.wsrep_debug; SET @@global.wsrep_debug=NULL; --error ER_WRONG_VALUE_FOR_VAR SET @@global.wsrep_debug='junk'; +--error ER_WRONG_VALUE_FOR_VAR +SET @@global.wsrep_debug=ON; --echo --echo # restore the initial value diff --git a/mysql-test/suite/sys_vars/t/wsrep_provider_options_basic.test b/mysql-test/suite/sys_vars/t/wsrep_provider_options_basic.test index d2ea32a0637..6eb3a94b6a4 100644 --- a/mysql-test/suite/sys_vars/t/wsrep_provider_options_basic.test +++ b/mysql-test/suite/sys_vars/t/wsrep_provider_options_basic.test @@ -6,11 +6,6 @@ call mtr.add_suppression("WSREP: Failed to get provider options"); -SET @@global.wsrep_provider = @@global.wsrep_provider; - ---echo # save the initial value -SET @wsrep_provider_options_global_saved = @@global.wsrep_provider_options; - --echo # default SELECT @@global.wsrep_provider_options; @@ -24,13 +19,13 @@ SELECT @@global.wsrep_provider_options; --echo --echo # valid values ---error 0,ER_WRONG_ARGUMENTS +--error ER_WRONG_ARGUMENTS SET @@global.wsrep_provider_options='name1=value1;name2=value2'; SELECT @@global.wsrep_provider_options; ---error 0,ER_WRONG_ARGUMENTS +--error ER_WRONG_ARGUMENTS SET @@global.wsrep_provider_options='hyphenated-name:value'; SELECT @@global.wsrep_provider_options; ---error 0,ER_WRONG_ARGUMENTS +--error ER_WRONG_ARGUMENTS SET @@global.wsrep_provider_options=default; SELECT @@global.wsrep_provider_options; @@ -43,9 +38,4 @@ SELECT @@global.wsrep_provider_options; SET @@global.wsrep_provider_options=NULL; SELECT @@global.wsrep_provider_options; ---echo ---echo # restore the initial value ---error 0,ER_WRONG_ARGUMENTS -SET @@global.wsrep_provider_options = @wsrep_provider_options_global_saved; - --echo # End of test |