diff options
Diffstat (limited to 'mysql-test/suite/sys_vars')
3 files changed, 1 insertions, 93 deletions
diff --git a/mysql-test/suite/sys_vars/r/sysvars_innodb.result b/mysql-test/suite/sys_vars/r/sysvars_innodb.result index 5b794166cc7..d44b8fbf470 100644 --- a/mysql-test/suite/sys_vars/r/sysvars_innodb.result +++ b/mysql-test/suite/sys_vars/r/sysvars_innodb.result @@ -279,7 +279,7 @@ DEFAULT_VALUE 134217728 VARIABLE_SCOPE GLOBAL VARIABLE_TYPE BIGINT UNSIGNED VARIABLE_COMMENT The size of the memory buffer InnoDB uses to cache data and indexes of its tables. -NUMERIC_MIN_VALUE 5242880 +NUMERIC_MIN_VALUE 2097152 NUMERIC_MAX_VALUE 9223372036854775807 NUMERIC_BLOCK_SIZE 1048576 ENUM_VALUE_LIST NULL diff --git a/mysql-test/suite/sys_vars/r/wsrep_slave_threads_basic.result b/mysql-test/suite/sys_vars/r/wsrep_slave_threads_basic.result deleted file mode 100644 index 62be5a42416..00000000000 --- a/mysql-test/suite/sys_vars/r/wsrep_slave_threads_basic.result +++ /dev/null @@ -1,49 +0,0 @@ -# -# wsrep_slave_threads -# -# save the initial value -SET @wsrep_slave_threads_global_saved = @@global.wsrep_slave_threads; -# default -SELECT @@global.wsrep_slave_threads; -@@global.wsrep_slave_threads -1 - -# scope -SELECT @@session.wsrep_slave_threads; -ERROR HY000: Variable 'wsrep_slave_threads' is a GLOBAL variable -SET @@global.wsrep_slave_threads=1; -SELECT @@global.wsrep_slave_threads; -@@global.wsrep_slave_threads -1 - -# valid values -SET @@global.wsrep_slave_threads=10; -SELECT @@global.wsrep_slave_threads; -@@global.wsrep_slave_threads -10 -SET @@global.wsrep_slave_threads=0; -Warnings: -Warning 1292 Truncated incorrect wsrep_slave_threads value: '0' -SELECT @@global.wsrep_slave_threads; -@@global.wsrep_slave_threads -1 -SET @@global.wsrep_slave_threads=default; -SELECT @global.wsrep_slave_threads; -@global.wsrep_slave_threads -NULL - -# invalid values -SET @@global.wsrep_slave_threads=NULL; -ERROR 42000: Incorrect argument type to variable 'wsrep_slave_threads' -SET @@global.wsrep_slave_threads='junk'; -ERROR 42000: Incorrect argument type to variable 'wsrep_slave_threads' -SET @@global.wsrep_slave_threads=-1; -Warnings: -Warning 1292 Truncated incorrect wsrep_slave_threads value: '-1' -SELECT @global.wsrep_slave_threads; -@global.wsrep_slave_threads -NULL - -# restore the initial value -SET @@global.wsrep_slave_threads = @wsrep_slave_threads_global_saved; -# End of test diff --git a/mysql-test/suite/sys_vars/t/wsrep_slave_threads_basic.test b/mysql-test/suite/sys_vars/t/wsrep_slave_threads_basic.test deleted file mode 100644 index 80b4648982d..00000000000 --- a/mysql-test/suite/sys_vars/t/wsrep_slave_threads_basic.test +++ /dev/null @@ -1,43 +0,0 @@ ---source include/have_wsrep.inc - ---echo # ---echo # wsrep_slave_threads ---echo # - ---echo # save the initial value -SET @wsrep_slave_threads_global_saved = @@global.wsrep_slave_threads; - ---echo # default -SELECT @@global.wsrep_slave_threads; - ---echo ---echo # scope ---error ER_INCORRECT_GLOBAL_LOCAL_VAR -SELECT @@session.wsrep_slave_threads; -SET @@global.wsrep_slave_threads=1; -SELECT @@global.wsrep_slave_threads; - ---echo ---echo # valid values -SET @@global.wsrep_slave_threads=10; -SELECT @@global.wsrep_slave_threads; -SET @@global.wsrep_slave_threads=0; -SELECT @@global.wsrep_slave_threads; -SET @@global.wsrep_slave_threads=default; -SELECT @global.wsrep_slave_threads; - ---echo ---echo # invalid values ---error ER_WRONG_TYPE_FOR_VAR -SET @@global.wsrep_slave_threads=NULL; ---error ER_WRONG_TYPE_FOR_VAR -SET @@global.wsrep_slave_threads='junk'; -# expect warning : Truncated incorrect wsrep_slave_threads value: '-1' -SET @@global.wsrep_slave_threads=-1; -SELECT @global.wsrep_slave_threads; - ---echo ---echo # restore the initial value -SET @@global.wsrep_slave_threads = @wsrep_slave_threads_global_saved; - ---echo # End of test |