diff options
62 files changed, 50 insertions, 3808 deletions
diff --git a/extra/mariabackup/xtrabackup.cc b/extra/mariabackup/xtrabackup.cc index 650ab49fbcd..6949975f7ef 100644 --- a/extra/mariabackup/xtrabackup.cc +++ b/extra/mariabackup/xtrabackup.cc @@ -753,7 +753,6 @@ enum options_xtrabackup OPT_INNODB_CHECKSUM_ALGORITHM, OPT_INNODB_UNDO_DIRECTORY, OPT_INNODB_UNDO_TABLESPACES, - OPT_INNODB_LOG_CHECKSUMS, OPT_XTRA_INCREMENTAL_FORCE_SCAN, OPT_DEFAULTS_GROUP, OPT_CLOSE_FILES, @@ -1195,10 +1194,6 @@ uint xb_client_options_count = array_elements(xb_client_options); static const char *dbug_option; #endif -namespace deprecated { -extern ulong srv_n_log_files; -} - struct my_option xb_server_options[] = { {"datadir", 'h', "Path to the database root.", (G_PTR*) &mysql_data_home, @@ -1305,10 +1300,6 @@ struct my_option xb_server_options[] = GET_ULL, REQUIRED_ARG, 48 << 20, 1 << 20, std::numeric_limits<ulonglong>::max(), 0, UNIV_PAGE_SIZE_MAX, 0}, - {"innodb_log_files_in_group", OPT_INNODB_LOG_FILES_IN_GROUP, - "Ignored for mysqld option compatibility", - &deprecated::srv_n_log_files, &deprecated::srv_n_log_files, - 0, GET_LONG, REQUIRED_ARG, 1, 1, 100, 0, 1, 0}, {"innodb_log_group_home_dir", OPT_INNODB_LOG_GROUP_HOME_DIR, "Path to InnoDB log files.", &srv_log_group_home_dir, &srv_log_group_home_dir, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0}, diff --git a/mysql-test/include/mix2.inc b/mysql-test/include/mix2.inc index 8e72e7ad2f6..5d7598694a6 100644 --- a/mysql-test/include/mix2.inc +++ b/mysql-test/include/mix2.inc @@ -1423,33 +1423,6 @@ show variables like "innodb_sync_spin_loops"; set global innodb_sync_spin_loops=20; show variables like "innodb_sync_spin_loops"; -# Test for innodb_thread_concurrency variable -show variables like "innodb_thread_concurrency"; -set global innodb_thread_concurrency=1001; -show variables like "innodb_thread_concurrency"; -set global innodb_thread_concurrency=0; -show variables like "innodb_thread_concurrency"; -set global innodb_thread_concurrency=16; -show variables like "innodb_thread_concurrency"; - -# Test for innodb_concurrency_tickets variable -show variables like "innodb_concurrency_tickets"; -set global innodb_concurrency_tickets=1000; -show variables like "innodb_concurrency_tickets"; -set global innodb_concurrency_tickets=0; -show variables like "innodb_concurrency_tickets"; -set global innodb_concurrency_tickets=500; -show variables like "innodb_concurrency_tickets"; - -# Test for innodb_thread_sleep_delay variable -show variables like "innodb_thread_sleep_delay"; -set global innodb_thread_sleep_delay=100000; -show variables like "innodb_thread_sleep_delay"; -set global innodb_thread_sleep_delay=0; -show variables like "innodb_thread_sleep_delay"; -set global innodb_thread_sleep_delay=10000; -show variables like "innodb_thread_sleep_delay"; - } diff --git a/mysql-test/main/index_merge_innodb.result b/mysql-test/main/index_merge_innodb.result index 775ef3d01e5..f1418d6a365 100644 --- a/mysql-test/main/index_merge_innodb.result +++ b/mysql-test/main/index_merge_innodb.result @@ -815,8 +815,6 @@ set optimizer_switch=@tmp_optimizer_switch; # on optimized builds # SET @save_sort_buffer_size=@@sort_buffer_size; -SET @save_innodb_file_format= @@innodb_file_format; -SET @save_innodb_large_prefix= @@innodb_large_prefix; SET sort_buffer_size=2048; CREATE TABLE t1 ( a VARCHAR(1024) CHARACTER SET UTF8 PRIMARY KEY, diff --git a/mysql-test/main/index_merge_innodb.test b/mysql-test/main/index_merge_innodb.test index c0918fec79f..5c4021036e7 100644 --- a/mysql-test/main/index_merge_innodb.test +++ b/mysql-test/main/index_merge_innodb.test @@ -206,8 +206,6 @@ set optimizer_switch=@tmp_optimizer_switch; --echo # SET @save_sort_buffer_size=@@sort_buffer_size; -SET @save_innodb_file_format= @@innodb_file_format; -SET @save_innodb_large_prefix= @@innodb_large_prefix; SET sort_buffer_size=2048; CREATE TABLE t1 ( diff --git a/mysql-test/main/partition_innodb.result b/mysql-test/main/partition_innodb.result index e212dadd06a..9e8546ea187 100644 --- a/mysql-test/main/partition_innodb.result +++ b/mysql-test/main/partition_innodb.result @@ -81,9 +81,6 @@ DROP TABLE t1; # Bug#54747: Deadlock between REORGANIZE PARTITION and # SELECT is not detected # -SET @old_innodb_thread_concurrency := @@innodb_thread_concurrency; -SET @old_innodb_thread_sleep_delay := @@innodb_thread_sleep_delay; -SET GLOBAL innodb_thread_concurrency = 1; CREATE TABLE t1 (user_num BIGINT, hours SMALLINT, @@ -116,8 +113,6 @@ connection con1; # Cleaning up. disconnect con1; connection default; -SET GLOBAL innodb_thread_concurrency = @old_innodb_thread_concurrency; -SET GLOBAL innodb_thread_sleep_delay = @old_innodb_thread_sleep_delay; DROP TABLE t1; # # Bug#50418: DROP PARTITION does not interact with transactions diff --git a/mysql-test/main/partition_innodb.test b/mysql-test/main/partition_innodb.test index cdf4e257e70..f3bbbb5cb63 100644 --- a/mysql-test/main/partition_innodb.test +++ b/mysql-test/main/partition_innodb.test @@ -95,10 +95,6 @@ DROP TABLE t1; --echo # SELECT is not detected --echo # -SET @old_innodb_thread_concurrency := @@innodb_thread_concurrency; -SET @old_innodb_thread_sleep_delay := @@innodb_thread_sleep_delay; -SET GLOBAL innodb_thread_concurrency = 1; - CREATE TABLE t1 (user_num BIGINT, hours SMALLINT, @@ -143,8 +139,6 @@ COMMIT; --connection default -SET GLOBAL innodb_thread_concurrency = @old_innodb_thread_concurrency; -SET GLOBAL innodb_thread_sleep_delay = @old_innodb_thread_sleep_delay; DROP TABLE t1; diff --git a/mysql-test/suite/encryption/r/innodb_encrypt_log.result b/mysql-test/suite/encryption/r/innodb_encrypt_log.result index 1a7a9267b60..b436435090b 100644 --- a/mysql-test/suite/encryption/r/innodb_encrypt_log.result +++ b/mysql-test/suite/encryption/r/innodb_encrypt_log.result @@ -5,12 +5,6 @@ # MDEV-9422 Encrypted redo log checksum errors # on restart after killing busy server instance # -SET GLOBAL innodb_log_checksums=0; -Warnings: -Warning 138 The parameter innodb_log_checksums is deprecated and has no effect. -SELECT @@global.innodb_log_checksums; -@@global.innodb_log_checksums -1 CREATE TABLE t0 ( pk bigint auto_increment, col_int int, diff --git a/mysql-test/suite/encryption/t/innodb_encrypt_log.test b/mysql-test/suite/encryption/t/innodb_encrypt_log.test index ead00ba54b8..1d016be73c8 100644 --- a/mysql-test/suite/encryption/t/innodb_encrypt_log.test +++ b/mysql-test/suite/encryption/t/innodb_encrypt_log.test @@ -13,9 +13,6 @@ --let $MYSQLD_DATADIR=`select @@datadir` -SET GLOBAL innodb_log_checksums=0; -SELECT @@global.innodb_log_checksums; - CREATE TABLE t0 ( pk bigint auto_increment, col_int int, diff --git a/mysql-test/suite/innodb/r/innodb_bug12400341.result b/mysql-test/suite/innodb/r/innodb_bug12400341.result index 7b7f1c1a981..f4114595819 100644 --- a/mysql-test/suite/innodb/r/innodb_bug12400341.result +++ b/mysql-test/suite/innodb/r/innodb_bug12400341.result @@ -1,14 +1,4 @@ -call mtr.add_suppression("InnoDB: Warning: cannot find a free slot for an undo log. Do you have too*"); call mtr.add_suppression("\\[Warning\\] InnoDB: Cannot find a free slot for an undo log. Do you have too"); -show variables like "max_connections"; -Variable_name Value -max_connections 64 -show variables like "innodb_thread_concurrency"; -Variable_name Value -innodb_thread_concurrency 0 -show variables like "innodb_file_per_table"; -Variable_name Value -innodb_file_per_table ON drop database if exists mysqltest; create database mysqltest; CREATE TABLE mysqltest.transtable (id int unsigned NOT NULL PRIMARY KEY, val int DEFAULT 0) ENGINE=InnoDB; diff --git a/mysql-test/suite/innodb/r/log_file_size.result b/mysql-test/suite/innodb/r/log_file_size.result index 3929747525e..a0ab35d5c43 100644 --- a/mysql-test/suite/innodb/r/log_file_size.result +++ b/mysql-test/suite/innodb/r/log_file_size.result @@ -1,9 +1,9 @@ CREATE TABLE t1(a INT PRIMARY KEY) ENGINE=InnoDB; -# restart: --innodb-thread-concurrency=1 --innodb-log-file-size=2m +# restart: --innodb-log-file-size=2m CHECK TABLE t1; Table Op Msg_type Msg_text test.t1 check status OK -# restart: --innodb-thread-concurrency=100 --innodb-log-file-size=20M +# restart: --innodb-log-file-size=20M BEGIN; INSERT INTO t1 VALUES (42); # restart: --innodb-log-file-size=12M diff --git a/mysql-test/suite/innodb/t/innodb_bug12400341-master.opt b/mysql-test/suite/innodb/t/innodb_bug12400341-master.opt deleted file mode 100644 index 9f65e8b12e4..00000000000 --- a/mysql-test/suite/innodb/t/innodb_bug12400341-master.opt +++ /dev/null @@ -1 +0,0 @@ ---max_connections=64 --innodb_thread_concurrency=0 diff --git a/mysql-test/suite/innodb/t/innodb_bug12400341.test b/mysql-test/suite/innodb/t/innodb_bug12400341.test index 3b5fd18a456..13eadc70bee 100644 --- a/mysql-test/suite/innodb/t/innodb_bug12400341.test +++ b/mysql-test/suite/innodb/t/innodb_bug12400341.test @@ -10,7 +10,6 @@ # undo slots of the previous test might exist still --source include/not_windows.inc -call mtr.add_suppression("InnoDB: Warning: cannot find a free slot for an undo log. Do you have too*"); call mtr.add_suppression("\\[Warning\\] InnoDB: Cannot find a free slot for an undo log. Do you have too"); --disable_query_log @@ -18,10 +17,6 @@ set @old_innodb_trx_rseg_n_slots_debug = @@innodb_trx_rseg_n_slots_debug; set global innodb_trx_rseg_n_slots_debug = 32; --enable_query_log -show variables like "max_connections"; -show variables like "innodb_thread_concurrency"; -show variables like "innodb_file_per_table"; - --disable_warnings drop database if exists mysqltest; --enable_warnings diff --git a/mysql-test/suite/innodb/t/innodb_information_schema_tables.opt b/mysql-test/suite/innodb/t/innodb_information_schema_tables.opt index 9f30d81ef9c..4edc71b6217 100644 --- a/mysql-test/suite/innodb/t/innodb_information_schema_tables.opt +++ b/mysql-test/suite/innodb/t/innodb_information_schema_tables.opt @@ -19,7 +19,6 @@ --loose-innodb_sys_foreign_cols --loose-innodb_changed_pages --loose-innodb_rseg ---loose-innodb_undo_logs --loose-innodb_sys_stats --loose-innodb_table_stats --loose-innodb_index_stats diff --git a/mysql-test/suite/innodb/t/log_file_size.test b/mysql-test/suite/innodb/t/log_file_size.test index 4c0d377a826..fc6cb1ef83e 100644 --- a/mysql-test/suite/innodb/t/log_file_size.test +++ b/mysql-test/suite/innodb/t/log_file_size.test @@ -36,13 +36,13 @@ let $check_no_innodb=SELECT * FROM INFORMATION_SCHEMA.ENGINES WHERE engine = 'innodb' AND support IN ('YES', 'DEFAULT', 'ENABLED'); ---let $restart_parameters= --innodb-thread-concurrency=1 --innodb-log-file-size=2m +--let $restart_parameters= --innodb-log-file-size=2m --source include/start_mysqld.inc let SEARCH_FILE= $MYSQLTEST_VARDIR/log/mysqld.1.err; CHECK TABLE t1; ---let $restart_parameters= --innodb-thread-concurrency=100 --innodb-log-file-size=20M +--let $restart_parameters= --innodb-log-file-size=20M --source include/restart_mysqld.inc BEGIN; diff --git a/mysql-test/suite/innodb_zip/r/prefix_index_liftedlimit.result b/mysql-test/suite/innodb_zip/r/prefix_index_liftedlimit.result index 2c66133404c..2c5dc69b4b6 100644 --- a/mysql-test/suite/innodb_zip/r/prefix_index_liftedlimit.result +++ b/mysql-test/suite/innodb_zip/r/prefix_index_liftedlimit.result @@ -1392,8 +1392,6 @@ VALUES(concat(REPEAT("a", 2000),REPEAT("b", 2000)), REPEAT("o", 4000)); ALTER TABLE worklog5743 ADD PRIMARY KEY `pk_idx` (col_1_varchar(3000)); ERROR 23000: Duplicate entry 'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa...' for key 'PRIMARY' DROP TABLE worklog5743; -set global innodb_large_prefix=0; -ERROR HY000: Variable 'innodb_large_prefix' is a read only variable CREATE TABLE worklog5743 ( col_1_varchar VARCHAR (4000) , col_2_varchar VARCHAR (4000) , PRIMARY KEY (col_1_varchar(3072)) diff --git a/mysql-test/suite/innodb_zip/t/prefix_index_liftedlimit.test b/mysql-test/suite/innodb_zip/t/prefix_index_liftedlimit.test index 55e69c5fca5..2bf37f7ee0c 100644 --- a/mysql-test/suite/innodb_zip/t/prefix_index_liftedlimit.test +++ b/mysql-test/suite/innodb_zip/t/prefix_index_liftedlimit.test @@ -1301,8 +1301,6 @@ ALTER TABLE worklog5743 ADD PRIMARY KEY `pk_idx` (col_1_varchar(3000)); DROP TABLE worklog5743; # ----------------------------------------------------------------------------- ---error ER_INCORRECT_GLOBAL_LOCAL_VAR -set global innodb_large_prefix=0; CREATE TABLE worklog5743 ( col_1_varchar VARCHAR (4000) , col_2_varchar VARCHAR (4000) , PRIMARY KEY (col_1_varchar(3072)) diff --git a/mysql-test/suite/perfschema/t/show_sanity.test b/mysql-test/suite/perfschema/t/show_sanity.test index f6c43c88111..5de3810fe65 100644 --- a/mysql-test/suite/perfschema/t/show_sanity.test +++ b/mysql-test/suite/perfschema/t/show_sanity.test @@ -386,12 +386,6 @@ insert into test.sanity values ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "INNODB_FLUSH_SYNC"), ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "INNODB_ADAPTIVE_HASH_INDEX"), ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "INNODB_ADAPTIVE_HASH_INDEX_PARTS"), - ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "INNODB_ADAPTIVE_MAX_SLEEP_DELAY"), - ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "INNODB_API_BK_COMMIT_INTERVAL"), - ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "INNODB_API_DISABLE_ROWLOCK"), - ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "INNODB_API_ENABLE_BINLOG"), - ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "INNODB_API_ENABLE_MDL"), - ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "INNODB_API_TRX_LEVEL"), ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "INNODB_AUTOEXTEND_INCREMENT"), ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "INNODB_AUTOINC_LOCK_MODE"), ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "INNODB_BACKGROUND_DROP_LIST_EMPTY"), @@ -401,7 +395,6 @@ insert into test.sanity values ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "INNODB_BUFFER_POOL_DUMP_PCT"), ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "INNODB_BUFFER_POOL_EVICT"), ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "INNODB_BUFFER_POOL_FILENAME"), - ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "INNODB_BUFFER_POOL_INSTANCES"), ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "INNODB_BUFFER_POOL_LOAD_ABORT"), ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "INNODB_BUFFER_POOL_LOAD_AT_STARTUP"), ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "INNODB_BUFFER_POOL_LOAD_NOW"), @@ -410,15 +403,12 @@ insert into test.sanity values ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "INNODB_CHANGE_BUFFERING"), ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "INNODB_CHANGE_BUFFERING_DEBUG"), ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "INNODB_CHANGE_BUFFER_MAX_SIZE"), - ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "INNODB_CHECKSUMS"), ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "INNODB_CHECKSUM_ALGORITHM"), ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "INNODB_CMP_PER_INDEX_ENABLED"), - ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "INNODB_COMMIT_CONCURRENCY"), ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "INNODB_COMPRESS_DEBUG"), ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "INNODB_COMPRESSION_FAILURE_THRESHOLD_PCT"), ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "INNODB_COMPRESSION_LEVEL"), ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "INNODB_COMPRESSION_PAD_PCT_MAX"), - ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "INNODB_CONCURRENCY_TICKETS"), ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "INNODB_DATA_FILE_PATH"), ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "INNODB_DATA_HOME_DIR"), ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "INNODB_DEFAULT_ROW_FORMAT"), @@ -460,9 +450,7 @@ insert into test.sanity values ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "INNODB_LOCKS_UNSAFE_FOR_BINLOG"), ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "INNODB_LOG_BUFFER_SIZE"), ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "INNODB_LOG_CHECKPOINT_NOW"), - ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "INNODB_LOG_CHECKSUMS"), ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "INNODB_LOG_COMPRESSED_PAGES"), - ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "INNODB_LOG_FILES_IN_GROUP"), ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "INNODB_LOG_FILE_SIZE"), ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "INNODB_LOG_GROUP_HOME_DIR"), ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "INNODB_LOG_WRITE_AHEAD_SIZE"), @@ -497,7 +485,6 @@ insert into test.sanity values ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "INNODB_READ_AHEAD_THRESHOLD"), ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "INNODB_READ_IO_THREADS"), ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "INNODB_READ_ONLY"), - ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "INNODB_REPLICATION_DELAY"), ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "INNODB_ROLLBACK_ON_TIMEOUT"), ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "INNODB_ROLLBACK_SEGMENTS"), ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "INNODB_SAVED_PAGE_NUMBER_DEBUG"), @@ -517,8 +504,6 @@ insert into test.sanity values ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "INNODB_SYNC_SPIN_LOOPS"), ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "INNODB_SYNC_DEBUG"), ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "INNODB_TEMP_DATA_FILE_PATH"), - ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "INNODB_THREAD_CONCURRENCY"), - ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "INNODB_THREAD_SLEEP_DELAY"), ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "INNODB_TRX_PURGE_VIEW_UPDATE_ONLY_DEBUG"), ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "INNODB_TRX_RSEG_N_SLOTS_DEBUG"), ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "INNODB_UNDO_DIRECTORY"), diff --git a/mysql-test/suite/sys_vars/r/innodb_adaptive_max_sleep_delay_basic.result b/mysql-test/suite/sys_vars/r/innodb_adaptive_max_sleep_delay_basic.result deleted file mode 100644 index c5f468a7427..00000000000 --- a/mysql-test/suite/sys_vars/r/innodb_adaptive_max_sleep_delay_basic.result +++ /dev/null @@ -1,86 +0,0 @@ -SELECT @@GLOBAL.innodb_adaptive_max_sleep_delay; -@@GLOBAL.innodb_adaptive_max_sleep_delay -0 -150000 Expected -SET @@GLOBAL.innodb_adaptive_max_sleep_delay=100; -Warnings: -Warning 138 The parameter innodb_adaptive_max_sleep_delay is deprecated and has no effect. -SET @@GLOBAL.innodb_adaptive_max_sleep_delay=0; -Warnings: -Warning 138 The parameter innodb_adaptive_max_sleep_delay is deprecated and has no effect. -SELECT @@GLOBAL.innodb_adaptive_max_sleep_delay; -@@GLOBAL.innodb_adaptive_max_sleep_delay -0 -SET @@GLOBAL.innodb_adaptive_max_sleep_delay=100000; -Warnings: -Warning 138 The parameter innodb_adaptive_max_sleep_delay is deprecated and has no effect. -SELECT @@GLOBAL.innodb_adaptive_max_sleep_delay; -@@GLOBAL.innodb_adaptive_max_sleep_delay -0 -SET @@GLOBAL.innodb_adaptive_max_sleep_delay=1000000; -Warnings: -Warning 138 The parameter innodb_adaptive_max_sleep_delay is deprecated and has no effect. -SELECT @@GLOBAL.innodb_adaptive_max_sleep_delay; -@@GLOBAL.innodb_adaptive_max_sleep_delay -0 -SET @@GLOBAL.innodb_adaptive_max_sleep_delay=1000001; -Warnings: -Warning 1292 Truncated incorrect innodb_adaptive_max_sleep_delay value: '1000001' -Warning 138 The parameter innodb_adaptive_max_sleep_delay is deprecated and has no effect. -SELECT @@GLOBAL.innodb_adaptive_max_sleep_delay; -@@GLOBAL.innodb_adaptive_max_sleep_delay -0 -1000000 Expected -SET @@GLOBAL.innodb_adaptive_max_sleep_delay=4294967295; -Warnings: -Warning 1292 Truncated incorrect innodb_adaptive_max_sleep_delay value: '4294967295' -Warning 138 The parameter innodb_adaptive_max_sleep_delay is deprecated and has no effect. -SELECT @@GLOBAL.innodb_adaptive_max_sleep_delay; -@@GLOBAL.innodb_adaptive_max_sleep_delay -0 -1000000 Expected -SET @@GLOBAL.innodb_adaptive_max_sleep_delay=-1; -Warnings: -Warning 1292 Truncated incorrect innodb_adaptive_max_sleep_delay value: '-1' -Warning 138 The parameter innodb_adaptive_max_sleep_delay is deprecated and has no effect. -SELECT @@GLOBAL.innodb_adaptive_max_sleep_delay; -@@GLOBAL.innodb_adaptive_max_sleep_delay -0 -0 Expected -SET @@GLOBAL.innodb_adaptive_max_sleep_delay=-1024; -Warnings: -Warning 1292 Truncated incorrect innodb_adaptive_max_sleep_delay value: '-1024' -Warning 138 The parameter innodb_adaptive_max_sleep_delay is deprecated and has no effect. -SELECT @@GLOBAL.innodb_adaptive_max_sleep_delay; -@@GLOBAL.innodb_adaptive_max_sleep_delay -0 -0 Expected -SELECT COUNT(@@GLOBAL.innodb_adaptive_max_sleep_delay); -COUNT(@@GLOBAL.innodb_adaptive_max_sleep_delay) -1 -1 Expected -SELECT VARIABLE_VALUE -FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES -WHERE VARIABLE_NAME='innodb_adaptive_max_sleep_delay'; -VARIABLE_VALUE -0 -100 Expected -SELECT @@innodb_adaptive_max_sleep_delay = @@GLOBAL.innodb_adaptive_max_sleep_delay; -@@innodb_adaptive_max_sleep_delay = @@GLOBAL.innodb_adaptive_max_sleep_delay -1 -1000000 Expected -SELECT COUNT(@@innodb_adaptive_max_sleep_delay); -COUNT(@@innodb_adaptive_max_sleep_delay) -1 -1 Expected -SELECT COUNT(@@local.innodb_adaptive_max_sleep_delay); -ERROR HY000: Variable 'innodb_adaptive_max_sleep_delay' is a GLOBAL variable -Expected error 'Variable is a GLOBAL variable' -SELECT COUNT(@@SESSION.innodb_adaptive_max_sleep_delay); -ERROR HY000: Variable 'innodb_adaptive_max_sleep_delay' is a GLOBAL variable -Expected error 'Variable is a GLOBAL variable' -SELECT innodb_adaptive_max_sleep_delay = @@SESSION.innodb_adaptive_max_sleep_delay; -ERROR 42S22: Unknown column 'innodb_adaptive_max_sleep_delay' in 'field list' -SET @@GLOBAL.innodb_adaptive_max_sleep_delay=150000; -Warnings: -Warning 138 The parameter innodb_adaptive_max_sleep_delay is deprecated and has no effect. diff --git a/mysql-test/suite/sys_vars/r/innodb_background_scrub_data_check_interval_basic.result b/mysql-test/suite/sys_vars/r/innodb_background_scrub_data_check_interval_basic.result deleted file mode 100644 index 6020098acb9..00000000000 --- a/mysql-test/suite/sys_vars/r/innodb_background_scrub_data_check_interval_basic.result +++ /dev/null @@ -1,88 +0,0 @@ -SET @start_global_value = @@global.innodb_background_scrub_data_check_interval; -# -# default value -# -select @@global.innodb_background_scrub_data_check_interval; -@@global.innodb_background_scrub_data_check_interval -0 -set global innodb_background_scrub_data_check_interval=10; -Warnings: -Warning 138 The parameter innodb_background_scrub_data_check_interval is deprecated and has no effect. -select @@global.innodb_background_scrub_data_check_interval; -@@global.innodb_background_scrub_data_check_interval -0 -set global innodb_background_scrub_data_check_interval=DEFAULT; -Warnings: -Warning 138 The parameter innodb_background_scrub_data_check_interval is deprecated and has no effect. -select @@global.innodb_background_scrub_data_check_interval; -@@global.innodb_background_scrub_data_check_interval -0 -set global innodb_background_scrub_data_check_interval=20; -Warnings: -Warning 138 The parameter innodb_background_scrub_data_check_interval is deprecated and has no effect. -select @@global.innodb_background_scrub_data_check_interval; -@@global.innodb_background_scrub_data_check_interval -0 -set global innodb_background_scrub_data_check_interval=DEFAULT; -Warnings: -Warning 138 The parameter innodb_background_scrub_data_check_interval is deprecated and has no effect. -select @@global.innodb_background_scrub_data_check_interval; -@@global.innodb_background_scrub_data_check_interval -0 -# -# exists as global only -# -select @@global.innodb_background_scrub_data_check_interval; -@@global.innodb_background_scrub_data_check_interval -0 -select @@session.innodb_background_scrub_data_check_interval; -ERROR HY000: Variable 'innodb_background_scrub_data_check_interval' is a GLOBAL variable -show global variables like 'innodb_background_scrub_data_check_interval'; -Variable_name Value -innodb_background_scrub_data_check_interval 0 -show session variables like 'innodb_background_scrub_data_check_interval'; -Variable_name Value -innodb_background_scrub_data_check_interval 0 -select * from information_schema.global_variables -where variable_name='innodb_background_scrub_data_check_interval'; -VARIABLE_NAME VARIABLE_VALUE -INNODB_BACKGROUND_SCRUB_DATA_CHECK_INTERVAL 0 -select * from information_schema.session_variables -where variable_name='innodb_background_scrub_data_check_interval'; -VARIABLE_NAME VARIABLE_VALUE -INNODB_BACKGROUND_SCRUB_DATA_CHECK_INTERVAL 0 -# -# show that it's writable -# -set global innodb_background_scrub_data_check_interval=10; -Warnings: -Warning 138 The parameter innodb_background_scrub_data_check_interval is deprecated and has no effect. -select @@global.innodb_background_scrub_data_check_interval; -@@global.innodb_background_scrub_data_check_interval -0 -set global innodb_background_scrub_data_check_interval=20; -Warnings: -Warning 138 The parameter innodb_background_scrub_data_check_interval is deprecated and has no effect. -select @@global.innodb_background_scrub_data_check_interval; -@@global.innodb_background_scrub_data_check_interval -0 -set global innodb_background_scrub_data_check_interval=1; -Warnings: -Warning 138 The parameter innodb_background_scrub_data_check_interval is deprecated and has no effect. -select @@global.innodb_background_scrub_data_check_interval; -@@global.innodb_background_scrub_data_check_interval -0 -set session innodb_background_scrub_data_check_interval=1; -ERROR HY000: Variable 'innodb_background_scrub_data_check_interval' is a GLOBAL variable and should be set with SET GLOBAL -# -# incorrect types -# -set global innodb_background_scrub_data_check_interval=1.1; -ERROR 42000: Incorrect argument type to variable 'innodb_background_scrub_data_check_interval' -set global innodb_background_scrub_data_check_interval=1e1; -ERROR 42000: Incorrect argument type to variable 'innodb_background_scrub_data_check_interval' -set global innodb_background_scrub_data_check_interval="foo"; -ERROR 42000: Incorrect argument type to variable 'innodb_background_scrub_data_check_interval' -SET @@global.innodb_background_scrub_data_check_interval = @start_global_value; -Warnings: -Warning 138 The parameter innodb_background_scrub_data_check_interval is deprecated and has no effect. diff --git a/mysql-test/suite/sys_vars/r/innodb_background_scrub_data_compressed_basic.result b/mysql-test/suite/sys_vars/r/innodb_background_scrub_data_compressed_basic.result deleted file mode 100644 index cf78f063adc..00000000000 --- a/mysql-test/suite/sys_vars/r/innodb_background_scrub_data_compressed_basic.result +++ /dev/null @@ -1,58 +0,0 @@ -SET @start_global_value = @@global.innodb_background_scrub_data_compressed; -# -# exists as global only -# -select @@global.innodb_background_scrub_data_compressed; -@@global.innodb_background_scrub_data_compressed -0 -select @@session.innodb_background_scrub_data_compressed; -ERROR HY000: Variable 'innodb_background_scrub_data_compressed' is a GLOBAL variable -show global variables like 'innodb_background_scrub_data_compressed'; -Variable_name Value -innodb_background_scrub_data_compressed OFF -show session variables like 'innodb_background_scrub_data_compressed'; -Variable_name Value -innodb_background_scrub_data_compressed OFF -select * from information_schema.global_variables -where variable_name='innodb_background_scrub_data_compressed'; -VARIABLE_NAME VARIABLE_VALUE -INNODB_BACKGROUND_SCRUB_DATA_COMPRESSED OFF -select * from information_schema.session_variables -where variable_name='innodb_background_scrub_data_compressed'; -VARIABLE_NAME VARIABLE_VALUE -INNODB_BACKGROUND_SCRUB_DATA_COMPRESSED OFF -# -# show that it's writable -# -set global innodb_background_scrub_data_compressed=ON; -Warnings: -Warning 138 The parameter innodb_background_scrub_data_compressed is deprecated and has no effect. -select @@global.innodb_background_scrub_data_compressed; -@@global.innodb_background_scrub_data_compressed -0 -set global innodb_background_scrub_data_compressed=OFF; -Warnings: -Warning 138 The parameter innodb_background_scrub_data_compressed is deprecated and has no effect. -select @@global.innodb_background_scrub_data_compressed; -@@global.innodb_background_scrub_data_compressed -0 -set global innodb_background_scrub_data_compressed=1; -Warnings: -Warning 138 The parameter innodb_background_scrub_data_compressed is deprecated and has no effect. -select @@global.innodb_background_scrub_data_compressed; -@@global.innodb_background_scrub_data_compressed -0 -set session innodb_background_scrub_data_compressed=1; -ERROR HY000: Variable 'innodb_background_scrub_data_compressed' is a GLOBAL variable and should be set with SET GLOBAL -# -# incorrect types -# -set global innodb_background_scrub_data_compressed=1.1; -ERROR 42000: Incorrect argument type to variable 'innodb_background_scrub_data_compressed' -set global innodb_background_scrub_data_compressed=1e1; -ERROR 42000: Incorrect argument type to variable 'innodb_background_scrub_data_compressed' -set global innodb_background_scrub_data_compressed="foo"; -ERROR 42000: Variable 'innodb_background_scrub_data_compressed' can't be set to the value of 'foo' -SET @@global.innodb_background_scrub_data_compressed = @start_global_value; -Warnings: -Warning 138 The parameter innodb_background_scrub_data_compressed is deprecated and has no effect. diff --git a/mysql-test/suite/sys_vars/r/innodb_background_scrub_data_interval_basic.result b/mysql-test/suite/sys_vars/r/innodb_background_scrub_data_interval_basic.result deleted file mode 100644 index 338736c385e..00000000000 --- a/mysql-test/suite/sys_vars/r/innodb_background_scrub_data_interval_basic.result +++ /dev/null @@ -1,58 +0,0 @@ -SET @start_global_value = @@global.innodb_background_scrub_data_interval; -# -# exists as global only -# -select @@global.innodb_background_scrub_data_interval; -@@global.innodb_background_scrub_data_interval -0 -select @@session.innodb_background_scrub_data_interval; -ERROR HY000: Variable 'innodb_background_scrub_data_interval' is a GLOBAL variable -show global variables like 'innodb_background_scrub_data_interval'; -Variable_name Value -innodb_background_scrub_data_interval 0 -show session variables like 'innodb_background_scrub_data_interval'; -Variable_name Value -innodb_background_scrub_data_interval 0 -select * from information_schema.global_variables -where variable_name='innodb_background_scrub_data_interval'; -VARIABLE_NAME VARIABLE_VALUE -INNODB_BACKGROUND_SCRUB_DATA_INTERVAL 0 -select * from information_schema.session_variables -where variable_name='innodb_background_scrub_data_interval'; -VARIABLE_NAME VARIABLE_VALUE -INNODB_BACKGROUND_SCRUB_DATA_INTERVAL 0 -# -# show that it's writable -# -set global innodb_background_scrub_data_interval=100; -Warnings: -Warning 138 The parameter innodb_background_scrub_data_interval is deprecated and has no effect. -select @@global.innodb_background_scrub_data_interval; -@@global.innodb_background_scrub_data_interval -0 -set global innodb_background_scrub_data_interval=200; -Warnings: -Warning 138 The parameter innodb_background_scrub_data_interval is deprecated and has no effect. -select @@global.innodb_background_scrub_data_interval; -@@global.innodb_background_scrub_data_interval -0 -set global innodb_background_scrub_data_interval=300; -Warnings: -Warning 138 The parameter innodb_background_scrub_data_interval is deprecated and has no effect. -select @@global.innodb_background_scrub_data_interval; -@@global.innodb_background_scrub_data_interval -0 -set session innodb_background_scrub_data_interval=400; -ERROR HY000: Variable 'innodb_background_scrub_data_interval' is a GLOBAL variable and should be set with SET GLOBAL -# -# incorrect types -# -set global innodb_background_scrub_data_interval=1.1; -ERROR 42000: Incorrect argument type to variable 'innodb_background_scrub_data_interval' -set global innodb_background_scrub_data_interval=1e1; -ERROR 42000: Incorrect argument type to variable 'innodb_background_scrub_data_interval' -set global innodb_background_scrub_data_interval="foo"; -ERROR 42000: Incorrect argument type to variable 'innodb_background_scrub_data_interval' -SET @@global.innodb_background_scrub_data_interval = @start_global_value; -Warnings: -Warning 138 The parameter innodb_background_scrub_data_interval is deprecated and has no effect. diff --git a/mysql-test/suite/sys_vars/r/innodb_background_scrub_data_uncompressed_basic.result b/mysql-test/suite/sys_vars/r/innodb_background_scrub_data_uncompressed_basic.result deleted file mode 100644 index 93337b838f9..00000000000 --- a/mysql-test/suite/sys_vars/r/innodb_background_scrub_data_uncompressed_basic.result +++ /dev/null @@ -1,58 +0,0 @@ -SET @start_global_value = @@global.innodb_background_scrub_data_uncompressed; -# -# exists as global only -# -select @@global.innodb_background_scrub_data_uncompressed; -@@global.innodb_background_scrub_data_uncompressed -0 -select @@session.innodb_background_scrub_data_uncompressed; -ERROR HY000: Variable 'innodb_background_scrub_data_uncompressed' is a GLOBAL variable -show global variables like 'innodb_background_scrub_data_uncompressed'; -Variable_name Value -innodb_background_scrub_data_uncompressed OFF -show session variables like 'innodb_background_scrub_data_uncompressed'; -Variable_name Value -innodb_background_scrub_data_uncompressed OFF -select * from information_schema.global_variables -where variable_name='innodb_background_scrub_data_uncompressed'; -VARIABLE_NAME VARIABLE_VALUE -INNODB_BACKGROUND_SCRUB_DATA_UNCOMPRESSED OFF -select * from information_schema.session_variables -where variable_name='innodb_background_scrub_data_uncompressed'; -VARIABLE_NAME VARIABLE_VALUE -INNODB_BACKGROUND_SCRUB_DATA_UNCOMPRESSED OFF -# -# show that it's writable -# -set global innodb_background_scrub_data_uncompressed=ON; -Warnings: -Warning 138 The parameter innodb_background_scrub_data_uncompressed is deprecated and has no effect. -select @@global.innodb_background_scrub_data_uncompressed; -@@global.innodb_background_scrub_data_uncompressed -0 -set global innodb_background_scrub_data_uncompressed=OFF; -Warnings: -Warning 138 The parameter innodb_background_scrub_data_uncompressed is deprecated and has no effect. -select @@global.innodb_background_scrub_data_uncompressed; -@@global.innodb_background_scrub_data_uncompressed -0 -set global innodb_background_scrub_data_uncompressed=1; -Warnings: -Warning 138 The parameter innodb_background_scrub_data_uncompressed is deprecated and has no effect. -select @@global.innodb_background_scrub_data_uncompressed; -@@global.innodb_background_scrub_data_uncompressed -0 -set session innodb_background_scrub_data_uncompressed=1; -ERROR HY000: Variable 'innodb_background_scrub_data_uncompressed' is a GLOBAL variable and should be set with SET GLOBAL -# -# incorrect types -# -set global innodb_background_scrub_data_uncompressed=1.1; -ERROR 42000: Incorrect argument type to variable 'innodb_background_scrub_data_uncompressed' -set global innodb_background_scrub_data_uncompressed=1e1; -ERROR 42000: Incorrect argument type to variable 'innodb_background_scrub_data_uncompressed' -set global innodb_background_scrub_data_uncompressed="foo"; -ERROR 42000: Variable 'innodb_background_scrub_data_uncompressed' can't be set to the value of 'foo' -SET @@global.innodb_background_scrub_data_uncompressed = @start_global_value; -Warnings: -Warning 138 The parameter innodb_background_scrub_data_uncompressed is deprecated and has no effect. diff --git a/mysql-test/suite/sys_vars/r/innodb_buffer_pool_instances_basic.result b/mysql-test/suite/sys_vars/r/innodb_buffer_pool_instances_basic.result deleted file mode 100644 index a3c1a7b7bd4..00000000000 --- a/mysql-test/suite/sys_vars/r/innodb_buffer_pool_instances_basic.result +++ /dev/null @@ -1,53 +0,0 @@ -'#---------------------BS_STVARS_035_01----------------------#' -SELECT COUNT(@@GLOBAL.innodb_buffer_pool_instances); -COUNT(@@GLOBAL.innodb_buffer_pool_instances) -1 -1 Expected -'#---------------------BS_STVARS_035_02----------------------#' -SET @@GLOBAL.innodb_buffer_pool_instances=1; -ERROR HY000: Variable 'innodb_buffer_pool_instances' is a read only variable -Expected error 'Read only variable' -SELECT COUNT(@@GLOBAL.innodb_buffer_pool_instances); -COUNT(@@GLOBAL.innodb_buffer_pool_instances) -1 -1 Expected -'#---------------------BS_STVARS_035_03----------------------#' -SELECT @@GLOBAL.innodb_buffer_pool_instances = VARIABLE_VALUE -FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES -WHERE VARIABLE_NAME='innodb_buffer_pool_instances'; -@@GLOBAL.innodb_buffer_pool_instances = VARIABLE_VALUE -1 -1 Expected -SELECT COUNT(@@GLOBAL.innodb_buffer_pool_instances); -COUNT(@@GLOBAL.innodb_buffer_pool_instances) -1 -1 Expected -SELECT COUNT(VARIABLE_VALUE) -FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES -WHERE VARIABLE_NAME='innodb_buffer_pool_instances'; -COUNT(VARIABLE_VALUE) -1 -1 Expected -'#---------------------BS_STVARS_035_04----------------------#' -SELECT @@innodb_buffer_pool_instances = @@GLOBAL.innodb_buffer_pool_instances; -@@innodb_buffer_pool_instances = @@GLOBAL.innodb_buffer_pool_instances -1 -1 Expected -'#---------------------BS_STVARS_035_05----------------------#' -SELECT COUNT(@@innodb_buffer_pool_instances); -COUNT(@@innodb_buffer_pool_instances) -1 -1 Expected -SELECT COUNT(@@local.innodb_buffer_pool_instances); -ERROR HY000: Variable 'innodb_buffer_pool_instances' is a GLOBAL variable -Expected error 'Variable is a GLOBAL variable' -SELECT COUNT(@@SESSION.innodb_buffer_pool_instances); -ERROR HY000: Variable 'innodb_buffer_pool_instances' is a GLOBAL variable -Expected error 'Variable is a GLOBAL variable' -SELECT COUNT(@@GLOBAL.innodb_buffer_pool_instances); -COUNT(@@GLOBAL.innodb_buffer_pool_instances) -1 -1 Expected -SELECT innodb_buffer_pool_instances = @@SESSION.innodb_buffer_pool_instances; -ERROR 42S22: Unknown column 'innodb_buffer_pool_instances' in 'field list' -Expected error 'Readonly variable' diff --git a/mysql-test/suite/sys_vars/r/innodb_commit_concurrency_basic.result b/mysql-test/suite/sys_vars/r/innodb_commit_concurrency_basic.result deleted file mode 100644 index 3c1f6a7d2aa..00000000000 --- a/mysql-test/suite/sys_vars/r/innodb_commit_concurrency_basic.result +++ /dev/null @@ -1,105 +0,0 @@ -SET @global_start_value = @@global.innodb_commit_concurrency; -SELECT @global_start_value; -@global_start_value -0 -'#--------------------FN_DYNVARS_046_01------------------------#' -SET @@global.innodb_commit_concurrency = 0; -Warnings: -Warning 138 The parameter innodb_commit_concurrency is deprecated and has no effect. -SET @@global.innodb_commit_concurrency = DEFAULT; -Warnings: -Warning 138 The parameter innodb_commit_concurrency is deprecated and has no effect. -SELECT @@global.innodb_commit_concurrency; -@@global.innodb_commit_concurrency -0 -'#---------------------FN_DYNVARS_046_02-------------------------#' -SET innodb_commit_concurrency = 1; -ERROR HY000: Variable 'innodb_commit_concurrency' is a GLOBAL variable and should be set with SET GLOBAL -SET GLOBAL innodb_commit_concurrency = 1; -Warnings: -Warning 138 The parameter innodb_commit_concurrency is deprecated and has no effect. -SELECT @@innodb_commit_concurrency; -@@innodb_commit_concurrency -0 -SELECT local.innodb_commit_concurrency; -ERROR 42S02: Unknown table 'local' in field list -SET global innodb_commit_concurrency = 0; -Warnings: -Warning 138 The parameter innodb_commit_concurrency is deprecated and has no effect. -SELECT @@global.innodb_commit_concurrency; -@@global.innodb_commit_concurrency -0 -'#--------------------FN_DYNVARS_046_03------------------------#' -SET @@global.innodb_commit_concurrency = 0; -Warnings: -Warning 138 The parameter innodb_commit_concurrency is deprecated and has no effect. -SELECT @@global.innodb_commit_concurrency; -@@global.innodb_commit_concurrency -0 -'#--------------------FN_DYNVARS_046_04-------------------------#' -SELECT @@global.innodb_commit_concurrency; -@@global.innodb_commit_concurrency -0 -SELECT @@global.innodb_commit_concurrency; -@@global.innodb_commit_concurrency -0 -SET @@global.innodb_commit_concurrency = -1; -Warnings: -Warning 1292 Truncated incorrect innodb_commit_concurrency value: '-1' -Warning 138 The parameter innodb_commit_concurrency is deprecated and has no effect. -SELECT @@global.innodb_commit_concurrency; -@@global.innodb_commit_concurrency -0 -SET @@global.innodb_commit_concurrency = "T"; -ERROR 42000: Incorrect argument type to variable 'innodb_commit_concurrency' -SELECT @@global.innodb_commit_concurrency; -@@global.innodb_commit_concurrency -0 -SET @@global.innodb_commit_concurrency = "Y"; -ERROR 42000: Incorrect argument type to variable 'innodb_commit_concurrency' -SELECT @@global.innodb_commit_concurrency; -@@global.innodb_commit_concurrency -0 -SET @@global.innodb_commit_concurrency = 1.1; -ERROR 42000: Incorrect argument type to variable 'innodb_commit_concurrency' -SELECT @@global.innodb_commit_concurrency; -@@global.innodb_commit_concurrency -0 -SET @@global.innodb_commit_concurrency = 1001; -Warnings: -Warning 1292 Truncated incorrect innodb_commit_concurrency value: '1001' -Warning 138 The parameter innodb_commit_concurrency is deprecated and has no effect. -SELECT @@global.innodb_commit_concurrency; -@@global.innodb_commit_concurrency -0 -'#----------------------FN_DYNVARS_046_05------------------------#' -SELECT @@global.innodb_commit_concurrency = -VARIABLE_VALUE FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES -WHERE VARIABLE_NAME='innodb_commit_concurrency'; -@@global.innodb_commit_concurrency = -VARIABLE_VALUE -1 -SELECT @@global.innodb_commit_concurrency; -@@global.innodb_commit_concurrency -0 -SELECT VARIABLE_VALUE FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES -WHERE VARIABLE_NAME='innodb_commit_concurrency'; -VARIABLE_VALUE -0 -'#---------------------FN_DYNVARS_046_06-------------------------#' -SET @@global.innodb_commit_concurrency = OFF; -ERROR 42000: Incorrect argument type to variable 'innodb_commit_concurrency' -SELECT @@global.innodb_commit_concurrency; -@@global.innodb_commit_concurrency -0 -SET @@global.innodb_commit_concurrency = ON; -ERROR 42000: Incorrect argument type to variable 'innodb_commit_concurrency' -SELECT @@global.innodb_commit_concurrency; -@@global.innodb_commit_concurrency -0 -SET @@global.innodb_commit_concurrency = @global_start_value; -Warnings: -Warning 138 The parameter innodb_commit_concurrency is deprecated and has no effect. -SELECT @@global.innodb_commit_concurrency; -@@global.innodb_commit_concurrency -0 diff --git a/mysql-test/suite/sys_vars/r/innodb_concurrency_tickets_basic.result b/mysql-test/suite/sys_vars/r/innodb_concurrency_tickets_basic.result deleted file mode 100644 index 5d35833dd88..00000000000 --- a/mysql-test/suite/sys_vars/r/innodb_concurrency_tickets_basic.result +++ /dev/null @@ -1,144 +0,0 @@ -SET @global_start_value = @@global.innodb_concurrency_tickets; -SELECT @global_start_value; -@global_start_value -0 -'#--------------------FN_DYNVARS_046_01------------------------#' -SET @@global.innodb_concurrency_tickets = 0; -Warnings: -Warning 138 The parameter innodb_concurrency_tickets is deprecated and has no effect. -SET @@global.innodb_concurrency_tickets = DEFAULT; -Warnings: -Warning 138 The parameter innodb_concurrency_tickets is deprecated and has no effect. -SELECT @@global.innodb_concurrency_tickets; -@@global.innodb_concurrency_tickets -0 -'#---------------------FN_DYNVARS_046_02-------------------------#' -SET innodb_concurrency_tickets = 1; -ERROR HY000: Variable 'innodb_concurrency_tickets' is a GLOBAL variable and should be set with SET GLOBAL -SELECT @@innodb_concurrency_tickets; -@@innodb_concurrency_tickets -0 -SELECT local.innodb_concurrency_tickets; -ERROR 42S02: Unknown table 'local' in field list -SET global innodb_concurrency_tickets = 0; -Warnings: -Warning 138 The parameter innodb_concurrency_tickets is deprecated and has no effect. -SELECT @@global.innodb_concurrency_tickets; -@@global.innodb_concurrency_tickets -0 -'#--------------------FN_DYNVARS_046_03------------------------#' -SET @@global.innodb_concurrency_tickets = 1; -Warnings: -Warning 138 The parameter innodb_concurrency_tickets is deprecated and has no effect. -SELECT @@global.innodb_concurrency_tickets; -@@global.innodb_concurrency_tickets -0 -SET @@global.innodb_concurrency_tickets = 1000; -Warnings: -Warning 138 The parameter innodb_concurrency_tickets is deprecated and has no effect. -SELECT @@global.innodb_concurrency_tickets; -@@global.innodb_concurrency_tickets -0 -SET @@global.innodb_concurrency_tickets = 4294967295; -Warnings: -Warning 138 The parameter innodb_concurrency_tickets is deprecated and has no effect. -SELECT @@global.innodb_concurrency_tickets; -@@global.innodb_concurrency_tickets -0 -'#--------------------FN_DYNVARS_046_04-------------------------#' -SET @@global.innodb_concurrency_tickets = 4294967296; -SELECT @@global.innodb_concurrency_tickets IN (4294967296,4294967295); -@@global.innodb_concurrency_tickets IN (4294967296,4294967295) -0 -SET @@global.innodb_concurrency_tickets = 12345678901; -SELECT @@global.innodb_concurrency_tickets IN (12345678901,4294967295); -@@global.innodb_concurrency_tickets IN (12345678901,4294967295) -0 -SET @@global.innodb_concurrency_tickets = 18446744073709551615; -SELECT @@global.innodb_concurrency_tickets IN (18446744073709551615,4294967295); -@@global.innodb_concurrency_tickets IN (18446744073709551615,4294967295) -0 -'#--------------------FN_DYNVARS_046_05-------------------------#' -SET @@global.innodb_concurrency_tickets = -1; -Warnings: -Warning 1292 Truncated incorrect innodb_concurrency_tickets value: '-1' -Warning 138 The parameter innodb_concurrency_tickets is deprecated and has no effect. -SELECT @@global.innodb_concurrency_tickets; -@@global.innodb_concurrency_tickets -0 -SET @@global.innodb_concurrency_tickets = -1024; -Warnings: -Warning 1292 Truncated incorrect innodb_concurrency_tickets value: '-1024' -Warning 138 The parameter innodb_concurrency_tickets is deprecated and has no effect. -SELECT @@global.innodb_concurrency_tickets; -@@global.innodb_concurrency_tickets -0 -SET @@global.innodb_concurrency_tickets = "T"; -ERROR 42000: Incorrect argument type to variable 'innodb_concurrency_tickets' -SELECT @@global.innodb_concurrency_tickets; -@@global.innodb_concurrency_tickets -0 -SET @@global.innodb_concurrency_tickets = "Y"; -ERROR 42000: Incorrect argument type to variable 'innodb_concurrency_tickets' -SELECT @@global.innodb_concurrency_tickets; -@@global.innodb_concurrency_tickets -0 -SET @@global.innodb_concurrency_tickets = 1.1; -ERROR 42000: Incorrect argument type to variable 'innodb_concurrency_tickets' -SELECT @@global.innodb_concurrency_tickets; -@@global.innodb_concurrency_tickets -0 -SET @@global.innodb_concurrency_tickets = " "; -ERROR 42000: Incorrect argument type to variable 'innodb_concurrency_tickets' -SELECT @@global.innodb_concurrency_tickets; -@@global.innodb_concurrency_tickets -0 -SET @@global.innodb_concurrency_tickets = ' '; -ERROR 42000: Incorrect argument type to variable 'innodb_concurrency_tickets' -SELECT @@global.innodb_concurrency_tickets; -@@global.innodb_concurrency_tickets -0 -'#----------------------FN_DYNVARS_046_06------------------------#' -SELECT @@global.innodb_concurrency_tickets = -VARIABLE_VALUE FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES -WHERE VARIABLE_NAME='innodb_concurrency_tickets'; -@@global.innodb_concurrency_tickets = -VARIABLE_VALUE -1 -SELECT @@global.innodb_concurrency_tickets; -@@global.innodb_concurrency_tickets -0 -SELECT VARIABLE_VALUE FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES -WHERE VARIABLE_NAME='innodb_concurrency_tickets'; -VARIABLE_VALUE -0 -'#---------------------FN_DYNVARS_046_07-------------------------#' -SET @@global.innodb_concurrency_tickets = OFF; -ERROR 42000: Incorrect argument type to variable 'innodb_concurrency_tickets' -SELECT @@global.innodb_concurrency_tickets; -@@global.innodb_concurrency_tickets -0 -SET @@global.innodb_concurrency_tickets = ON; -ERROR 42000: Incorrect argument type to variable 'innodb_concurrency_tickets' -SELECT @@global.innodb_concurrency_tickets; -@@global.innodb_concurrency_tickets -0 -'#---------------------FN_DYNVARS_046_08----------------------#' -SET @@global.innodb_concurrency_tickets = TRUE; -Warnings: -Warning 138 The parameter innodb_concurrency_tickets is deprecated and has no effect. -SELECT @@global.innodb_concurrency_tickets; -@@global.innodb_concurrency_tickets -0 -SET @@global.innodb_concurrency_tickets = FALSE; -Warnings: -Warning 138 The parameter innodb_concurrency_tickets is deprecated and has no effect. -SELECT @@global.innodb_concurrency_tickets; -@@global.innodb_concurrency_tickets -0 -SET @@global.innodb_concurrency_tickets = @global_start_value; -Warnings: -Warning 138 The parameter innodb_concurrency_tickets is deprecated and has no effect. -SELECT @@global.innodb_concurrency_tickets; -@@global.innodb_concurrency_tickets -0 diff --git a/mysql-test/suite/sys_vars/r/innodb_log_checksums_basic.result b/mysql-test/suite/sys_vars/r/innodb_log_checksums_basic.result deleted file mode 100644 index bf70bbb1bea..00000000000 --- a/mysql-test/suite/sys_vars/r/innodb_log_checksums_basic.result +++ /dev/null @@ -1,50 +0,0 @@ -SET @orig = @@global.innodb_log_checksums; -SELECT @orig; -@orig -1 -SET GLOBAL innodb_log_checksums = 'crc32'; -ERROR 42000: Variable 'innodb_log_checksums' can't be set to the value of 'crc32' -SELECT @@global.innodb_log_checksums; -@@global.innodb_log_checksums -1 -SET GLOBAL innodb_log_checksums = 2; -ERROR 42000: Variable 'innodb_log_checksums' can't be set to the value of '2' -SELECT @@global.innodb_log_checksums; -@@global.innodb_log_checksums -1 -SET GLOBAL innodb_log_checksums = 1e2; -ERROR 42000: Incorrect argument type to variable 'innodb_log_checksums' -SELECT @@global.innodb_log_checksums; -@@global.innodb_log_checksums -1 -SET GLOBAL innodb_log_checksums = 1.0; -ERROR 42000: Incorrect argument type to variable 'innodb_log_checksums' -SELECT @@global.innodb_log_checksums; -@@global.innodb_log_checksums -1 -SET innodb_log_checksums = OFF; -ERROR HY000: Variable 'innodb_log_checksums' is a GLOBAL variable and should be set with SET GLOBAL -SELECT @@global.innodb_log_checksums; -@@global.innodb_log_checksums -1 -SET GLOBAL innodb_log_checksums = OFF; -Warnings: -Warning 138 The parameter innodb_log_checksums is deprecated and has no effect. -SELECT @@global.innodb_log_checksums; -@@global.innodb_log_checksums -1 -SET GLOBAL innodb_log_checksums = default; -Warnings: -Warning 138 The parameter innodb_log_checksums is deprecated and has no effect. -SET GLOBAL innodb_log_checksums = ON; -Warnings: -Warning 138 The parameter innodb_log_checksums is deprecated and has no effect. -SELECT @@global.innodb_log_checksums; -@@global.innodb_log_checksums -1 -SET GLOBAL innodb_log_checksums = @orig; -Warnings: -Warning 138 The parameter innodb_log_checksums is deprecated and has no effect. -SELECT @@global.innodb_log_checksums; -@@global.innodb_log_checksums -1 diff --git a/mysql-test/suite/sys_vars/r/innodb_log_compressed_pages_basic.result b/mysql-test/suite/sys_vars/r/innodb_log_compressed_pages_basic.result deleted file mode 100644 index 62c7bf73176..00000000000 --- a/mysql-test/suite/sys_vars/r/innodb_log_compressed_pages_basic.result +++ /dev/null @@ -1,79 +0,0 @@ -SET @start_global_value = @@global.innodb_log_compressed_pages; -SELECT @start_global_value; -@start_global_value -1 -'#---------------------BS_STVARS_028_01----------------------#' -SELECT COUNT(@@GLOBAL.innodb_log_compressed_pages); -COUNT(@@GLOBAL.innodb_log_compressed_pages) -1 -1 Expected -'#---------------------BS_STVARS_028_02----------------------#' -SET @@global.innodb_log_compressed_pages = 0; -Warnings: -Warning 138 The parameter innodb_log_compressed_pages is deprecated and has no effect. -SELECT @@global.innodb_log_compressed_pages; -@@global.innodb_log_compressed_pages -1 -SET @@global.innodb_log_compressed_pages ='On' ; -Warnings: -Warning 138 The parameter innodb_log_compressed_pages is deprecated and has no effect. -SELECT @@global.innodb_log_compressed_pages; -@@global.innodb_log_compressed_pages -1 -SET @@global.innodb_log_compressed_pages ='Off' ; -Warnings: -Warning 138 The parameter innodb_log_compressed_pages is deprecated and has no effect. -SELECT @@global.innodb_log_compressed_pages; -@@global.innodb_log_compressed_pages -1 -SET @@global.innodb_log_compressed_pages = 1; -Warnings: -Warning 138 The parameter innodb_log_compressed_pages is deprecated and has no effect. -SELECT @@global.innodb_log_compressed_pages; -@@global.innodb_log_compressed_pages -1 -'#---------------------BS_STVARS_028_03----------------------#' -SELECT IF(@@GLOBAL.innodb_log_compressed_pages,'ON','OFF') = VARIABLE_VALUE -FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES -WHERE VARIABLE_NAME='innodb_log_compressed_pages'; -IF(@@GLOBAL.innodb_log_compressed_pages,'ON','OFF') = VARIABLE_VALUE -1 -1 Expected -SELECT COUNT(@@GLOBAL.innodb_log_compressed_pages); -COUNT(@@GLOBAL.innodb_log_compressed_pages) -1 -1 Expected -SELECT COUNT(VARIABLE_VALUE) -FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES -WHERE VARIABLE_NAME='innodb_log_compressed_pages'; -COUNT(VARIABLE_VALUE) -1 -1 Expected -'#---------------------BS_STVARS_028_04----------------------#' -SELECT @@innodb_log_compressed_pages = @@GLOBAL.innodb_log_compressed_pages; -@@innodb_log_compressed_pages = @@GLOBAL.innodb_log_compressed_pages -1 -1 Expected -'#---------------------BS_STVARS_028_05----------------------#' -SELECT COUNT(@@innodb_log_compressed_pages); -COUNT(@@innodb_log_compressed_pages) -1 -1 Expected -SELECT COUNT(@@local.innodb_log_compressed_pages); -ERROR HY000: Variable 'innodb_log_compressed_pages' is a GLOBAL variable -Expected error 'Variable is a GLOBAL variable' -SELECT COUNT(@@SESSION.innodb_log_compressed_pages); -ERROR HY000: Variable 'innodb_log_compressed_pages' is a GLOBAL variable -Expected error 'Variable is a GLOBAL variable' -SELECT COUNT(@@GLOBAL.innodb_log_compressed_pages); -COUNT(@@GLOBAL.innodb_log_compressed_pages) -1 -1 Expected -SELECT innodb_log_compressed_pages = @@SESSION.innodb_log_compressed_pages; -ERROR 42S22: Unknown column 'innodb_log_compressed_pages' in 'field list' -SET @@global.innodb_log_compressed_pages = @start_global_value; -Warnings: -Warning 138 The parameter innodb_log_compressed_pages is deprecated and has no effect. -SELECT @@global.innodb_log_compressed_pages; -@@global.innodb_log_compressed_pages -1 diff --git a/mysql-test/suite/sys_vars/r/innodb_log_files_in_group_basic.result b/mysql-test/suite/sys_vars/r/innodb_log_files_in_group_basic.result deleted file mode 100644 index 1191ef010f8..00000000000 --- a/mysql-test/suite/sys_vars/r/innodb_log_files_in_group_basic.result +++ /dev/null @@ -1,53 +0,0 @@ -'#---------------------BS_STVARS_034_01----------------------#' -SELECT COUNT(@@GLOBAL.innodb_log_files_in_group); -COUNT(@@GLOBAL.innodb_log_files_in_group) -1 -1 Expected -'#---------------------BS_STVARS_034_02----------------------#' -SET @@GLOBAL.innodb_log_files_in_group=1; -ERROR HY000: Variable 'innodb_log_files_in_group' is a read only variable -Expected error 'Read only variable' -SELECT COUNT(@@GLOBAL.innodb_log_files_in_group); -COUNT(@@GLOBAL.innodb_log_files_in_group) -1 -1 Expected -'#---------------------BS_STVARS_034_03----------------------#' -SELECT @@GLOBAL.innodb_log_files_in_group = VARIABLE_VALUE -FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES -WHERE VARIABLE_NAME='innodb_log_files_in_group'; -@@GLOBAL.innodb_log_files_in_group = VARIABLE_VALUE -1 -1 Expected -SELECT COUNT(@@GLOBAL.innodb_log_files_in_group); -COUNT(@@GLOBAL.innodb_log_files_in_group) -1 -1 Expected -SELECT COUNT(VARIABLE_VALUE) -FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES -WHERE VARIABLE_NAME='innodb_log_files_in_group'; -COUNT(VARIABLE_VALUE) -1 -1 Expected -'#---------------------BS_STVARS_034_04----------------------#' -SELECT @@innodb_log_files_in_group = @@GLOBAL.innodb_log_files_in_group; -@@innodb_log_files_in_group = @@GLOBAL.innodb_log_files_in_group -1 -1 Expected -'#---------------------BS_STVARS_034_05----------------------#' -SELECT COUNT(@@innodb_log_files_in_group); -COUNT(@@innodb_log_files_in_group) -1 -1 Expected -SELECT COUNT(@@local.innodb_log_files_in_group); -ERROR HY000: Variable 'innodb_log_files_in_group' is a GLOBAL variable -Expected error 'Variable is a GLOBAL variable' -SELECT COUNT(@@SESSION.innodb_log_files_in_group); -ERROR HY000: Variable 'innodb_log_files_in_group' is a GLOBAL variable -Expected error 'Variable is a GLOBAL variable' -SELECT COUNT(@@GLOBAL.innodb_log_files_in_group); -COUNT(@@GLOBAL.innodb_log_files_in_group) -1 -1 Expected -SELECT innodb_log_files_in_group = @@SESSION.innodb_log_files_in_group; -ERROR 42S22: Unknown column 'innodb_log_files_in_group' in 'field list' -Expected error 'Readonly variable' diff --git a/mysql-test/suite/sys_vars/r/innodb_log_optimize_ddl_basic.result b/mysql-test/suite/sys_vars/r/innodb_log_optimize_ddl_basic.result deleted file mode 100644 index 45773ff8d6a..00000000000 --- a/mysql-test/suite/sys_vars/r/innodb_log_optimize_ddl_basic.result +++ /dev/null @@ -1,42 +0,0 @@ -SELECT COUNT(@@GLOBAL.innodb_log_optimize_ddl); -COUNT(@@GLOBAL.innodb_log_optimize_ddl) -1 -1 Expected -SELECT COUNT(@@SESSION.innodb_log_optimize_ddl); -ERROR HY000: Variable 'innodb_log_optimize_ddl' is a GLOBAL variable -Expected error 'Variable is a GLOBAL variable' -SELECT @@GLOBAL.innodb_log_optimize_ddl INTO @innodb_log_optimize_ddl_save; -SET @@GLOBAL.innodb_log_optimize_ddl = ON; -Warnings: -Warning 138 The parameter innodb_log_optimize_ddl is deprecated and has no effect. -SET @@GLOBAL.innodb_log_optimize_ddl = OFF; -Warnings: -Warning 138 The parameter innodb_log_optimize_ddl is deprecated and has no effect. -SET @@GLOBAL.innodb_log_optimize_ddl = 13; -ERROR 42000: Variable 'innodb_log_optimize_ddl' can't be set to the value of '13' -SET @@GLOBAL.innodb_log_optimize_ddl = 'ABC'; -ERROR 42000: Variable 'innodb_log_optimize_ddl' can't be set to the value of 'ABC' -SELECT @@GLOBAL.innodb_log_optimize_ddl = 0 -OR @@GLOBAL.innodb_log_optimize_ddl = 1 AS col; -col -1 -1 Expected -SELECT @@innodb_log_optimize_ddl = @@GLOBAL.innodb_log_optimize_ddl AS col; -col -1 -1 Expected -SELECT VARIABLE_VALUE FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES -WHERE VARIABLE_NAME='innodb_log_optimize_ddl'; -VARIABLE_VALUE -OFF -SHOW VARIABLES WHERE VARIABLE_NAME='innodb_log_optimize_ddl'; -Variable_name Value -innodb_log_optimize_ddl OFF -SELECT @@local.innodb_log_optimize_ddl; -ERROR HY000: Variable 'innodb_log_optimize_ddl' is a GLOBAL variable -Expected error 'Variable is a GLOBAL variable' -SELECT innodb_log_optimize_ddl; -ERROR 42S22: Unknown column 'innodb_log_optimize_ddl' in 'field list' -SET GLOBAL innodb_log_optimize_ddl = @innodb_log_optimize_ddl_save; -Warnings: -Warning 138 The parameter innodb_log_optimize_ddl is deprecated and has no effect. diff --git a/mysql-test/suite/sys_vars/r/innodb_page_cleaners_basic.result b/mysql-test/suite/sys_vars/r/innodb_page_cleaners_basic.result deleted file mode 100644 index db9d94c5fac..00000000000 --- a/mysql-test/suite/sys_vars/r/innodb_page_cleaners_basic.result +++ /dev/null @@ -1,78 +0,0 @@ -SELECT COUNT(@@GLOBAL.innodb_page_cleaners); -COUNT(@@GLOBAL.innodb_page_cleaners) -1 -1 Expected -SELECT @@innodb_page_cleaners; -@@innodb_page_cleaners -1 -1 Expected -SET @@GLOBAL.innodb_page_cleaners=2; -Warnings: -Warning 138 The parameter innodb_page_cleaners is deprecated and has no effect. -Expected to pass -SELECT @@innodb_page_cleaners; -@@innodb_page_cleaners -1 -2 Expected -SET @@GLOBAL.innodb_page_cleaners=1; -Warnings: -Warning 138 The parameter innodb_page_cleaners is deprecated and has no effect. -Expected to pass -SELECT @@innodb_page_cleaners; -@@innodb_page_cleaners -1 -1 Expected -SET @@GLOBAL.innodb_page_cleaners=6; -Warnings: -Warning 138 The parameter innodb_page_cleaners is deprecated and has no effect. -Expected to pass -SELECT @@innodb_page_cleaners; -@@innodb_page_cleaners -1 -6 Expected -SET @@GLOBAL.innodb_page_cleaners=4; -Warnings: -Warning 138 The parameter innodb_page_cleaners is deprecated and has no effect. -Expected to pass -SELECT @@innodb_page_cleaners; -@@innodb_page_cleaners -1 -4 Expected -SET @@GLOBAL.innodb_page_cleaners=0; -Warnings: -Warning 138 The parameter innodb_page_cleaners is deprecated and has no effect. -Warning expected -SELECT @@innodb_page_cleaners; -@@innodb_page_cleaners -1 -1 Expected -SELECT innodb_page_cleaners = @@SESSION.innodb_page_cleaners; -ERROR 42S22: Unknown column 'innodb_page_cleaners' in 'field list' -Expected error 'Read-only variable' -SELECT @@GLOBAL.innodb_page_cleaners = VARIABLE_VALUE -FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES -WHERE VARIABLE_NAME='innodb_page_cleaners'; -@@GLOBAL.innodb_page_cleaners = VARIABLE_VALUE -1 -1 Expected -SELECT COUNT(VARIABLE_VALUE) -FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES -WHERE VARIABLE_NAME='innodb_page_cleaners'; -COUNT(VARIABLE_VALUE) -1 -1 Expected -SELECT @@innodb_page_cleaners = @@GLOBAL.innodb_page_cleaners; -@@innodb_page_cleaners = @@GLOBAL.innodb_page_cleaners -1 -1 Expected -SELECT COUNT(@@local.innodb_page_cleaners); -ERROR HY000: Variable 'innodb_page_cleaners' is a GLOBAL variable -Expected error 'Variable is a GLOBAL variable' -SELECT COUNT(@@SESSION.innodb_page_cleaners); -ERROR HY000: Variable 'innodb_page_cleaners' is a GLOBAL variable -Expected error 'Variable is a GLOBAL variable' -SELECT VARIABLE_NAME, VARIABLE_VALUE -FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES -WHERE VARIABLE_NAME = 'innodb_page_cleaners'; -VARIABLE_NAME VARIABLE_VALUE -INNODB_PAGE_CLEANERS 1 diff --git a/mysql-test/suite/sys_vars/r/innodb_replication_delay_basic.result b/mysql-test/suite/sys_vars/r/innodb_replication_delay_basic.result deleted file mode 100644 index 53a499ff34b..00000000000 --- a/mysql-test/suite/sys_vars/r/innodb_replication_delay_basic.result +++ /dev/null @@ -1,114 +0,0 @@ -SET @start_global_value = @@global.innodb_replication_delay; -SELECT @start_global_value; -@start_global_value -0 -Valid values are zero or above -select @@global.innodb_replication_delay >=0; -@@global.innodb_replication_delay >=0 -1 -select @@global.innodb_replication_delay; -@@global.innodb_replication_delay -0 -select @@session.innodb_replication_delay; -ERROR HY000: Variable 'innodb_replication_delay' is a GLOBAL variable -show global variables like 'innodb_replication_delay'; -Variable_name Value -innodb_replication_delay 0 -show session variables like 'innodb_replication_delay'; -Variable_name Value -innodb_replication_delay 0 -select * from information_schema.global_variables where variable_name='innodb_replication_delay'; -VARIABLE_NAME VARIABLE_VALUE -INNODB_REPLICATION_DELAY 0 -select * from information_schema.session_variables where variable_name='innodb_replication_delay'; -VARIABLE_NAME VARIABLE_VALUE -INNODB_REPLICATION_DELAY 0 -set global innodb_replication_delay=10; -Warnings: -Warning 138 The parameter innodb_replication_delay is deprecated and has no effect. -select @@global.innodb_replication_delay; -@@global.innodb_replication_delay -0 -select * from information_schema.global_variables where variable_name='innodb_replication_delay'; -VARIABLE_NAME VARIABLE_VALUE -INNODB_REPLICATION_DELAY 0 -select * from information_schema.session_variables where variable_name='innodb_replication_delay'; -VARIABLE_NAME VARIABLE_VALUE -INNODB_REPLICATION_DELAY 0 -set session innodb_replication_delay=1; -ERROR HY000: Variable 'innodb_replication_delay' is a GLOBAL variable and should be set with SET GLOBAL -set global innodb_replication_delay=DEFAULT; -Warnings: -Warning 138 The parameter innodb_replication_delay is deprecated and has no effect. -select @@global.innodb_replication_delay; -@@global.innodb_replication_delay -0 -set global innodb_replication_delay=0; -Warnings: -Warning 138 The parameter innodb_replication_delay is deprecated and has no effect. -select @@global.innodb_replication_delay; -@@global.innodb_replication_delay -0 -set global innodb_replication_delay=65535; -Warnings: -Warning 138 The parameter innodb_replication_delay is deprecated and has no effect. -select @@global.innodb_replication_delay; -@@global.innodb_replication_delay -0 -set global innodb_replication_delay=4294967295; -Warnings: -Warning 138 The parameter innodb_replication_delay is deprecated and has no effect. -select @@global.innodb_replication_delay; -@@global.innodb_replication_delay -0 -set global innodb_replication_delay=1.1; -ERROR 42000: Incorrect argument type to variable 'innodb_replication_delay' -set global innodb_replication_delay=1e1; -ERROR 42000: Incorrect argument type to variable 'innodb_replication_delay' -set global innodb_replication_delay="foo"; -ERROR 42000: Incorrect argument type to variable 'innodb_replication_delay' -set global innodb_replication_delay=' '; -ERROR 42000: Incorrect argument type to variable 'innodb_replication_delay' -select @@global.innodb_replication_delay; -@@global.innodb_replication_delay -0 -set global innodb_replication_delay=" "; -ERROR 42000: Incorrect argument type to variable 'innodb_replication_delay' -select @@global.innodb_replication_delay; -@@global.innodb_replication_delay -0 -set global innodb_replication_delay=-7; -Warnings: -Warning 1292 Truncated incorrect innodb_replication_delay value: '-7' -Warning 138 The parameter innodb_replication_delay is deprecated and has no effect. -select @@global.innodb_replication_delay; -@@global.innodb_replication_delay -0 -set global innodb_replication_delay=-1024; -Warnings: -Warning 1292 Truncated incorrect innodb_replication_delay value: '-1024' -Warning 138 The parameter innodb_replication_delay is deprecated and has no effect. -select @@global.innodb_replication_delay; -@@global.innodb_replication_delay -0 -select * from information_schema.global_variables where variable_name='innodb_replication_delay'; -VARIABLE_NAME VARIABLE_VALUE -INNODB_REPLICATION_DELAY 0 -SET @@global.innodb_replication_delay = 4294967296; -SELECT @@global.innodb_replication_delay IN (4294967296,4294967295); -@@global.innodb_replication_delay IN (4294967296,4294967295) -0 -SET @@global.innodb_replication_delay = 12345678901; -SELECT @@global.innodb_replication_delay IN (12345678901,4294967295); -@@global.innodb_replication_delay IN (12345678901,4294967295) -0 -SET @@global.innodb_replication_delay = 18446744073709551615; -SELECT @@global.innodb_replication_delay IN (18446744073709551615,4294967295); -@@global.innodb_replication_delay IN (18446744073709551615,4294967295) -0 -SET @@global.innodb_replication_delay = @start_global_value; -Warnings: -Warning 138 The parameter innodb_replication_delay is deprecated and has no effect. -SELECT @@global.innodb_replication_delay; -@@global.innodb_replication_delay -0 diff --git a/mysql-test/suite/sys_vars/r/innodb_scrub_log_basic.result b/mysql-test/suite/sys_vars/r/innodb_scrub_log_basic.result deleted file mode 100644 index fc3a31fc5a2..00000000000 --- a/mysql-test/suite/sys_vars/r/innodb_scrub_log_basic.result +++ /dev/null @@ -1,48 +0,0 @@ -SELECT @@GLOBAL.innodb_scrub_log; -@@GLOBAL.innodb_scrub_log -0 -0 Expected -SET @@GLOBAL.innodb_scrub_log=1; -ERROR HY000: Variable 'innodb_scrub_log' is a read only variable -Expected error 'Read only variable' -SELECT @@GLOBAL.innodb_scrub_log; -@@GLOBAL.innodb_scrub_log -0 -0 Expected -SELECT IF(@@GLOBAL.innodb_scrub_log, 'ON', 'OFF') = VARIABLE_VALUE -FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES -WHERE VARIABLE_NAME='innodb_scrub_log'; -IF(@@GLOBAL.innodb_scrub_log, 'ON', 'OFF') = VARIABLE_VALUE -1 -1 Expected -SELECT @@GLOBAL.innodb_scrub_log; -@@GLOBAL.innodb_scrub_log -0 -0 Expected -SELECT VARIABLE_VALUE -FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES -WHERE VARIABLE_NAME='innodb_scrub_log'; -VARIABLE_VALUE -OFF -0 Expected -SELECT @@innodb_scrub_log = @@GLOBAL.innodb_scrub_log; -@@innodb_scrub_log = @@GLOBAL.innodb_scrub_log -1 -1 Expected -SELECT @@innodb_scrub_log; -@@innodb_scrub_log -0 -0 Expected -SELECT @@local.innodb_scrub_log; -ERROR HY000: Variable 'innodb_scrub_log' is a GLOBAL variable -Expected error 'Variable is a GLOBAL variable' -SELECT @@SESSION.innodb_scrub_log; -ERROR HY000: Variable 'innodb_scrub_log' is a GLOBAL variable -Expected error 'Variable is a GLOBAL variable' -SELECT @@GLOBAL.innodb_scrub_log; -@@GLOBAL.innodb_scrub_log -0 -0 Expected -SELECT innodb_scrub_log; -ERROR 42S22: Unknown column 'innodb_scrub_log' in 'field list' -Expected error 'Unknow column in field list' diff --git a/mysql-test/suite/sys_vars/r/innodb_scrub_log_speed_basic.result b/mysql-test/suite/sys_vars/r/innodb_scrub_log_speed_basic.result deleted file mode 100644 index c9b46cc0c95..00000000000 --- a/mysql-test/suite/sys_vars/r/innodb_scrub_log_speed_basic.result +++ /dev/null @@ -1,57 +0,0 @@ -SELECT @@GLOBAL.innodb_scrub_log_speed; -@@GLOBAL.innodb_scrub_log_speed -256 -200 Expected -SET @@GLOBAL.innodb_scrub_log_speed=100; -Warnings: -Warning 138 The parameter innodb_scrub_log_speed is deprecated and has no effect. -1 Expected -SELECT @@GLOBAL.innodb_scrub_log_speed; -@@GLOBAL.innodb_scrub_log_speed -256 -100 Expected -SET @@GLOBAL.innodb_scrub_log_speed=DEFAULT; -Warnings: -Warning 138 The parameter innodb_scrub_log_speed is deprecated and has no effect. -1 Expected -SELECT @@GLOBAL.innodb_scrub_log_speed; -@@GLOBAL.innodb_scrub_log_speed -256 -200 Expected -SELECT @@GLOBAL.innodb_scrub_log_speed = VARIABLE_VALUE -FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES -WHERE VARIABLE_NAME='innodb_scrub_log_speed'; -@@GLOBAL.innodb_scrub_log_speed = VARIABLE_VALUE -1 -1 Expected -SELECT @@GLOBAL.innodb_scrub_log_speed; -@@GLOBAL.innodb_scrub_log_speed -256 -200 Expected -SELECT VARIABLE_VALUE -FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES -WHERE VARIABLE_NAME='innodb_scrub_log_speed'; -VARIABLE_VALUE -256 -200 Expected -SELECT @@innodb_scrub_log_speed = @@GLOBAL.innodb_scrub_log_speed; -@@innodb_scrub_log_speed = @@GLOBAL.innodb_scrub_log_speed -1 -1 Expected -SELECT @@innodb_scrub_log_speed; -@@innodb_scrub_log_speed -256 -200 Expected -SELECT @@local.innodb_scrub_log_speed; -ERROR HY000: Variable 'innodb_scrub_log_speed' is a GLOBAL variable -Expected error 'Variable is a GLOBAL variable' -SELECT @@SESSION.innodb_scrub_log_speed; -ERROR HY000: Variable 'innodb_scrub_log_speed' is a GLOBAL variable -Expected error 'Variable is a GLOBAL variable' -SELECT @@GLOBAL.innodb_scrub_log_speed; -@@GLOBAL.innodb_scrub_log_speed -256 -200 Expected -SELECT innodb_scrub_log_speed; -ERROR 42S22: Unknown column 'innodb_scrub_log_speed' in 'field list' -Expected error 'Unknow column in field list' diff --git a/mysql-test/suite/sys_vars/r/innodb_thread_concurrency_basic.result b/mysql-test/suite/sys_vars/r/innodb_thread_concurrency_basic.result deleted file mode 100644 index 39d1a659a20..00000000000 --- a/mysql-test/suite/sys_vars/r/innodb_thread_concurrency_basic.result +++ /dev/null @@ -1,131 +0,0 @@ -SET @global_start_value = @@global.innodb_thread_concurrency; -SELECT @global_start_value; -@global_start_value -0 -'#--------------------FN_DYNVARS_046_01------------------------#' -SET @@global.innodb_thread_concurrency = 0; -Warnings: -Warning 138 The parameter innodb_thread_concurrency is deprecated and has no effect. -SET @@global.innodb_thread_concurrency = DEFAULT; -Warnings: -Warning 138 The parameter innodb_thread_concurrency is deprecated and has no effect. -SELECT @@global.innodb_thread_concurrency; -@@global.innodb_thread_concurrency -0 -'#---------------------FN_DYNVARS_046_02-------------------------#' -SET innodb_thread_concurrency = 1; -ERROR HY000: Variable 'innodb_thread_concurrency' is a GLOBAL variable and should be set with SET GLOBAL -SELECT @@innodb_thread_concurrency; -@@innodb_thread_concurrency -0 -SELECT local.innodb_thread_concurrency; -ERROR 42S02: Unknown table 'local' in field list -SET global innodb_thread_concurrency = 0; -Warnings: -Warning 138 The parameter innodb_thread_concurrency is deprecated and has no effect. -SELECT @@global.innodb_thread_concurrency; -@@global.innodb_thread_concurrency -0 -'#--------------------FN_DYNVARS_046_03------------------------#' -SET @@global.innodb_thread_concurrency = 0; -Warnings: -Warning 138 The parameter innodb_thread_concurrency is deprecated and has no effect. -SELECT @@global.innodb_thread_concurrency; -@@global.innodb_thread_concurrency -0 -SET @@global.innodb_thread_concurrency = 1; -Warnings: -Warning 138 The parameter innodb_thread_concurrency is deprecated and has no effect. -SELECT @@global.innodb_thread_concurrency; -@@global.innodb_thread_concurrency -0 -SET @@global.innodb_thread_concurrency = 1000; -Warnings: -Warning 138 The parameter innodb_thread_concurrency is deprecated and has no effect. -SELECT @@global.innodb_thread_concurrency; -@@global.innodb_thread_concurrency -0 -'#--------------------FN_DYNVARS_046_04-------------------------#' -SET @@global.innodb_thread_concurrency = -1; -Warnings: -Warning 1292 Truncated incorrect innodb_thread_concurrency value: '-1' -Warning 138 The parameter innodb_thread_concurrency is deprecated and has no effect. -SELECT @@global.innodb_thread_concurrency; -@@global.innodb_thread_concurrency -0 -SET @@global.innodb_thread_concurrency = "T"; -ERROR 42000: Incorrect argument type to variable 'innodb_thread_concurrency' -SELECT @@global.innodb_thread_concurrency; -@@global.innodb_thread_concurrency -0 -SET @@global.innodb_thread_concurrency = "Y"; -ERROR 42000: Incorrect argument type to variable 'innodb_thread_concurrency' -SELECT @@global.innodb_thread_concurrency; -@@global.innodb_thread_concurrency -0 -SET @@global.innodb_thread_concurrency = ' '; -ERROR 42000: Incorrect argument type to variable 'innodb_thread_concurrency' -SELECT @@global.innodb_thread_concurrency; -@@global.innodb_thread_concurrency -0 -SET @@global.innodb_thread_concurrency = " "; -ERROR 42000: Incorrect argument type to variable 'innodb_thread_concurrency' -SELECT @@global.innodb_thread_concurrency; -@@global.innodb_thread_concurrency -0 -SET @@global.innodb_thread_concurrency = 1001; -Warnings: -Warning 1292 Truncated incorrect innodb_thread_concurrency value: '1001' -Warning 138 The parameter innodb_thread_concurrency is deprecated and has no effect. -SELECT @@global.innodb_thread_concurrency; -@@global.innodb_thread_concurrency -0 -SET @@global.innodb_thread_concurrency = 255.01; -ERROR 42000: Incorrect argument type to variable 'innodb_thread_concurrency' -SELECT @@global.innodb_thread_concurrency; -@@global.innodb_thread_concurrency -0 -'#----------------------FN_DYNVARS_046_05------------------------#' -SELECT @@global.innodb_thread_concurrency = -VARIABLE_VALUE FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES -WHERE VARIABLE_NAME='innodb_thread_concurrency'; -@@global.innodb_thread_concurrency = -VARIABLE_VALUE -1 -SELECT @@global.innodb_thread_concurrency; -@@global.innodb_thread_concurrency -0 -SELECT VARIABLE_VALUE FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES -WHERE VARIABLE_NAME='innodb_thread_concurrency'; -VARIABLE_VALUE -0 -'#---------------------FN_DYNVARS_046_06-------------------------#' -SET @@global.innodb_thread_concurrency = OFF; -ERROR 42000: Incorrect argument type to variable 'innodb_thread_concurrency' -SELECT @@global.innodb_thread_concurrency; -@@global.innodb_thread_concurrency -0 -SET @@global.innodb_thread_concurrency = ON; -ERROR 42000: Incorrect argument type to variable 'innodb_thread_concurrency' -SELECT @@global.innodb_thread_concurrency; -@@global.innodb_thread_concurrency -0 -'#---------------------FN_DYNVARS_046_07----------------------#' -SET @@global.innodb_thread_concurrency = TRUE; -Warnings: -Warning 138 The parameter innodb_thread_concurrency is deprecated and has no effect. -SELECT @@global.innodb_thread_concurrency; -@@global.innodb_thread_concurrency -0 -SET @@global.innodb_thread_concurrency = FALSE; -Warnings: -Warning 138 The parameter innodb_thread_concurrency is deprecated and has no effect. -SELECT @@global.innodb_thread_concurrency; -@@global.innodb_thread_concurrency -0 -SET @@global.innodb_thread_concurrency = @global_start_value; -Warnings: -Warning 138 The parameter innodb_thread_concurrency is deprecated and has no effect. -SELECT @@global.innodb_thread_concurrency; -@@global.innodb_thread_concurrency -0 diff --git a/mysql-test/suite/sys_vars/r/innodb_thread_sleep_delay_basic.result b/mysql-test/suite/sys_vars/r/innodb_thread_sleep_delay_basic.result deleted file mode 100644 index b6310bb5652..00000000000 --- a/mysql-test/suite/sys_vars/r/innodb_thread_sleep_delay_basic.result +++ /dev/null @@ -1,104 +0,0 @@ -SET @start_global_value = @@global.innodb_thread_sleep_delay; -SELECT @start_global_value; -@start_global_value -0 -Valid values are zero or above -select @@global.innodb_thread_sleep_delay >=0; -@@global.innodb_thread_sleep_delay >=0 -1 -select @@global.innodb_thread_sleep_delay; -@@global.innodb_thread_sleep_delay -0 -select @@session.innodb_thread_sleep_delay; -ERROR HY000: Variable 'innodb_thread_sleep_delay' is a GLOBAL variable -show global variables like 'innodb_thread_sleep_delay'; -Variable_name Value -innodb_thread_sleep_delay 0 -show session variables like 'innodb_thread_sleep_delay'; -Variable_name Value -innodb_thread_sleep_delay 0 -select * from information_schema.global_variables where variable_name='innodb_thread_sleep_delay'; -VARIABLE_NAME VARIABLE_VALUE -INNODB_THREAD_SLEEP_DELAY 0 -select * from information_schema.session_variables where variable_name='innodb_thread_sleep_delay'; -VARIABLE_NAME VARIABLE_VALUE -INNODB_THREAD_SLEEP_DELAY 0 -set global innodb_thread_sleep_delay=10; -Warnings: -Warning 138 The parameter innodb_thread_sleep_delay is deprecated and has no effect. -select @@global.innodb_thread_sleep_delay; -@@global.innodb_thread_sleep_delay -0 -select * from information_schema.global_variables where variable_name='innodb_thread_sleep_delay'; -VARIABLE_NAME VARIABLE_VALUE -INNODB_THREAD_SLEEP_DELAY 0 -select * from information_schema.session_variables where variable_name='innodb_thread_sleep_delay'; -VARIABLE_NAME VARIABLE_VALUE -INNODB_THREAD_SLEEP_DELAY 0 -set session innodb_thread_sleep_delay=1; -ERROR HY000: Variable 'innodb_thread_sleep_delay' is a GLOBAL variable and should be set with SET GLOBAL -set global innodb_thread_sleep_delay=1.1; -ERROR 42000: Incorrect argument type to variable 'innodb_thread_sleep_delay' -set global innodb_thread_sleep_delay=1e1; -ERROR 42000: Incorrect argument type to variable 'innodb_thread_sleep_delay' -set global innodb_thread_sleep_delay="foo"; -ERROR 42000: Incorrect argument type to variable 'innodb_thread_sleep_delay' -set global innodb_thread_sleep_delay=18446744073709551616; -Warnings: -Warning 1916 Got overflow when converting '18446744073709551616' to INT. Value truncated -Warning 1292 Truncated incorrect innodb_thread_sleep_delay value: '9223372036854775807' -Warning 138 The parameter innodb_thread_sleep_delay is deprecated and has no effect. -set global innodb_thread_sleep_delay=-7; -Warnings: -Warning 1292 Truncated incorrect innodb_thread_sleep_delay value: '-7' -Warning 138 The parameter innodb_thread_sleep_delay is deprecated and has no effect. -select @@global.innodb_thread_sleep_delay; -@@global.innodb_thread_sleep_delay -0 -select * from information_schema.global_variables where variable_name='innodb_thread_sleep_delay'; -VARIABLE_NAME VARIABLE_VALUE -INNODB_THREAD_SLEEP_DELAY 0 -set global innodb_thread_sleep_delay=0; -Warnings: -Warning 138 The parameter innodb_thread_sleep_delay is deprecated and has no effect. -select @@global.innodb_thread_sleep_delay; -@@global.innodb_thread_sleep_delay -0 -set global innodb_thread_sleep_delay=1000; -Warnings: -Warning 138 The parameter innodb_thread_sleep_delay is deprecated and has no effect. -select @@global.innodb_thread_sleep_delay; -@@global.innodb_thread_sleep_delay -0 -set global innodb_thread_sleep_delay=1000000; -Warnings: -Warning 138 The parameter innodb_thread_sleep_delay is deprecated and has no effect. -select @@global.innodb_thread_sleep_delay; -@@global.innodb_thread_sleep_delay -0 -set global innodb_thread_sleep_delay=1000001; -Warnings: -Warning 1292 Truncated incorrect innodb_thread_sleep_delay value: '1000001' -Warning 138 The parameter innodb_thread_sleep_delay is deprecated and has no effect. -select @@global.innodb_thread_sleep_delay; -@@global.innodb_thread_sleep_delay -0 -set global innodb_thread_sleep_delay=4294967295; -Warnings: -Warning 1292 Truncated incorrect innodb_thread_sleep_delay value: '4294967295' -Warning 138 The parameter innodb_thread_sleep_delay is deprecated and has no effect. -select @@global.innodb_thread_sleep_delay; -@@global.innodb_thread_sleep_delay -0 -set global innodb_thread_sleep_delay=555; -Warnings: -Warning 138 The parameter innodb_thread_sleep_delay is deprecated and has no effect. -select @@global.innodb_thread_sleep_delay; -@@global.innodb_thread_sleep_delay -0 -SET @@global.innodb_thread_sleep_delay = @start_global_value; -Warnings: -Warning 138 The parameter innodb_thread_sleep_delay is deprecated and has no effect. -SELECT @@global.innodb_thread_sleep_delay; -@@global.innodb_thread_sleep_delay -0 diff --git a/mysql-test/suite/sys_vars/r/innodb_undo_logs_basic.result b/mysql-test/suite/sys_vars/r/innodb_undo_logs_basic.result deleted file mode 100644 index d6ff67ccc7d..00000000000 --- a/mysql-test/suite/sys_vars/r/innodb_undo_logs_basic.result +++ /dev/null @@ -1,44 +0,0 @@ -SELECT @@global.innodb_undo_logs; -@@global.innodb_undo_logs -128 -SELECT @@session.innodb_undo_logs; -ERROR HY000: Variable 'innodb_undo_logs' is a GLOBAL variable -SHOW global variables LIKE 'innodb_undo_logs'; -Variable_name Value -innodb_undo_logs 128 -SHOW session variables LIKE 'innodb_undo_logs'; -Variable_name Value -innodb_undo_logs 128 -SELECT * FROM information_schema.global_variables -WHERE variable_name='innodb_undo_logs'; -VARIABLE_NAME VARIABLE_VALUE -INNODB_UNDO_LOGS 128 -SELECT * FROM information_schema.session_variables -WHERE variable_name='innodb_undo_logs'; -VARIABLE_NAME VARIABLE_VALUE -INNODB_UNDO_LOGS 128 -SET global innodb_undo_logs=100; -Warnings: -Warning 138 The parameter innodb_undo_logs is deprecated and has no effect. -SELECT @@global.innodb_undo_logs; -@@global.innodb_undo_logs -128 -SET session innodb_undo_logs=1; -ERROR HY000: Variable 'innodb_undo_logs' is a GLOBAL variable and should be set with SET GLOBAL -SET global innodb_undo_logs=1.1; -ERROR 42000: Incorrect argument type to variable 'innodb_undo_logs' -SET global innodb_undo_logs=1e1; -ERROR 42000: Incorrect argument type to variable 'innodb_undo_logs' -SET global innodb_undo_logs="foo"; -ERROR 42000: Incorrect argument type to variable 'innodb_undo_logs' -SET global innodb_undo_logs=-7; -Warnings: -Warning 1292 Truncated incorrect innodb_undo_logs value: '-7' -Warning 138 The parameter innodb_undo_logs is deprecated and has no effect. -SELECT @@global.innodb_undo_logs; -@@global.innodb_undo_logs -128 -SELECT * FROM information_schema.global_variables -WHERE variable_name='innodb_undo_logs'; -VARIABLE_NAME VARIABLE_VALUE -INNODB_UNDO_LOGS 128 diff --git a/mysql-test/suite/sys_vars/r/sysvars_innodb.result b/mysql-test/suite/sys_vars/r/sysvars_innodb.result index 7e59a8ea810..b8a566a27cb 100644 --- a/mysql-test/suite/sys_vars/r/sysvars_innodb.result +++ b/mysql-test/suite/sys_vars/r/sysvars_innodb.result @@ -57,18 +57,6 @@ NUMERIC_BLOCK_SIZE 0 ENUM_VALUE_LIST NULL READ_ONLY YES COMMAND_LINE_ARGUMENT OPTIONAL -VARIABLE_NAME INNODB_ADAPTIVE_MAX_SLEEP_DELAY -SESSION_VALUE NULL -DEFAULT_VALUE 0 -VARIABLE_SCOPE GLOBAL -VARIABLE_TYPE INT UNSIGNED -VARIABLE_COMMENT Deprecated parameter with no effect. -NUMERIC_MIN_VALUE 0 -NUMERIC_MAX_VALUE 1000000 -NUMERIC_BLOCK_SIZE 0 -ENUM_VALUE_LIST NULL -READ_ONLY NO -COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME INNODB_AUTOEXTEND_INCREMENT SESSION_VALUE NULL DEFAULT_VALUE 64 @@ -105,54 +93,6 @@ NUMERIC_BLOCK_SIZE NULL ENUM_VALUE_LIST OFF,ON READ_ONLY NO COMMAND_LINE_ARGUMENT OPTIONAL -VARIABLE_NAME INNODB_BACKGROUND_SCRUB_DATA_CHECK_INTERVAL -SESSION_VALUE NULL -DEFAULT_VALUE 0 -VARIABLE_SCOPE GLOBAL -VARIABLE_TYPE INT UNSIGNED -VARIABLE_COMMENT Deprecated parameter with no effect. -NUMERIC_MIN_VALUE 0 -NUMERIC_MAX_VALUE 0 -NUMERIC_BLOCK_SIZE 0 -ENUM_VALUE_LIST NULL -READ_ONLY NO -COMMAND_LINE_ARGUMENT REQUIRED -VARIABLE_NAME INNODB_BACKGROUND_SCRUB_DATA_COMPRESSED -SESSION_VALUE NULL -DEFAULT_VALUE OFF -VARIABLE_SCOPE GLOBAL -VARIABLE_TYPE BOOLEAN -VARIABLE_COMMENT Deprecated parameter with no effect. -NUMERIC_MIN_VALUE NULL -NUMERIC_MAX_VALUE NULL -NUMERIC_BLOCK_SIZE NULL -ENUM_VALUE_LIST OFF,ON -READ_ONLY NO -COMMAND_LINE_ARGUMENT OPTIONAL -VARIABLE_NAME INNODB_BACKGROUND_SCRUB_DATA_INTERVAL -SESSION_VALUE NULL -DEFAULT_VALUE 0 -VARIABLE_SCOPE GLOBAL -VARIABLE_TYPE INT UNSIGNED -VARIABLE_COMMENT Deprecated parameter with no effect. -NUMERIC_MIN_VALUE 0 -NUMERIC_MAX_VALUE 0 -NUMERIC_BLOCK_SIZE 0 -ENUM_VALUE_LIST NULL -READ_ONLY NO -COMMAND_LINE_ARGUMENT REQUIRED -VARIABLE_NAME INNODB_BACKGROUND_SCRUB_DATA_UNCOMPRESSED -SESSION_VALUE NULL -DEFAULT_VALUE OFF -VARIABLE_SCOPE GLOBAL -VARIABLE_TYPE BOOLEAN -VARIABLE_COMMENT Deprecated parameter with no effect. -NUMERIC_MIN_VALUE NULL -NUMERIC_MAX_VALUE NULL -NUMERIC_BLOCK_SIZE NULL -ENUM_VALUE_LIST OFF,ON -READ_ONLY NO -COMMAND_LINE_ARGUMENT OPTIONAL VARIABLE_NAME INNODB_BUFFER_POOL_CHUNK_SIZE SESSION_VALUE NULL DEFAULT_VALUE 134217728 @@ -225,18 +165,6 @@ NUMERIC_BLOCK_SIZE NULL ENUM_VALUE_LIST NULL READ_ONLY NO COMMAND_LINE_ARGUMENT REQUIRED -VARIABLE_NAME INNODB_BUFFER_POOL_INSTANCES -SESSION_VALUE NULL -DEFAULT_VALUE 0 -VARIABLE_SCOPE GLOBAL -VARIABLE_TYPE BIGINT UNSIGNED -VARIABLE_COMMENT Deprecated parameter with no effect. -NUMERIC_MIN_VALUE 0 -NUMERIC_MAX_VALUE 64 -NUMERIC_BLOCK_SIZE 0 -ENUM_VALUE_LIST NULL -READ_ONLY YES -COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME INNODB_BUFFER_POOL_LOAD_ABORT SESSION_VALUE NULL DEFAULT_VALUE OFF @@ -362,7 +290,7 @@ SESSION_VALUE NULL DEFAULT_VALUE full_crc32 VARIABLE_SCOPE GLOBAL VARIABLE_TYPE ENUM -VARIABLE_COMMENT The algorithm InnoDB uses for page checksumming. Possible values are FULL_CRC32 for new files, always use CRC-32C; for old, see CRC32 below; STRICT_FULL_CRC32 for new files, always use CRC-32C; for old, see STRICT_CRC32 below; CRC32 write crc32, allow any of the other checksums to match when reading; STRICT_CRC32 write crc32, do not allow other algorithms to match when reading; INNODB write a software calculated checksum, allow any other checksums to match when reading; STRICT_INNODB write a software calculated checksum, do not allow other algorithms to match when reading; NONE write a constant magic number, do not do any checksum verification when reading (same as innodb_checksums=OFF); STRICT_NONE write a constant magic number, do not allow values other than that magic number when reading; Files updated when this option is set to crc32 or strict_crc32 will not be readable by MariaDB versions older than 10.0.4; new files created with full_crc32 are readable by MariaDB 10.4.3+ +VARIABLE_COMMENT The algorithm InnoDB uses for page checksumming. Possible values are FULL_CRC32 for new files, always use CRC-32C; for old, see CRC32 below; STRICT_FULL_CRC32 for new files, always use CRC-32C; for old, see STRICT_CRC32 below; CRC32 write crc32, allow any of the other checksums to match when reading; STRICT_CRC32 write crc32, do not allow other algorithms to match when reading; INNODB write a software calculated checksum, allow any other checksums to match when reading; STRICT_INNODB write a software calculated checksum, do not allow other algorithms to match when reading; NONE write a constant magic number, do not do any checksum verification when reading; STRICT_NONE write a constant magic number, do not allow values other than that magic number when reading; Files updated when this option is set to crc32 or strict_crc32 will not be readable by MariaDB versions older than 10.0.4; new files created with full_crc32 are readable by MariaDB 10.4.3+ NUMERIC_MIN_VALUE NULL NUMERIC_MAX_VALUE NULL NUMERIC_BLOCK_SIZE NULL @@ -381,18 +309,6 @@ NUMERIC_BLOCK_SIZE NULL ENUM_VALUE_LIST OFF,ON READ_ONLY NO COMMAND_LINE_ARGUMENT OPTIONAL -VARIABLE_NAME INNODB_COMMIT_CONCURRENCY -SESSION_VALUE NULL -DEFAULT_VALUE 0 -VARIABLE_SCOPE GLOBAL -VARIABLE_TYPE INT UNSIGNED -VARIABLE_COMMENT Deprecated parameter with no effect. -NUMERIC_MIN_VALUE 0 -NUMERIC_MAX_VALUE 1000 -NUMERIC_BLOCK_SIZE 0 -ENUM_VALUE_LIST NULL -READ_ONLY NO -COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME INNODB_COMPRESSION_ALGORITHM SESSION_VALUE NULL DEFAULT_VALUE zlib @@ -453,18 +369,6 @@ NUMERIC_BLOCK_SIZE 0 ENUM_VALUE_LIST NULL READ_ONLY NO COMMAND_LINE_ARGUMENT OPTIONAL -VARIABLE_NAME INNODB_CONCURRENCY_TICKETS -SESSION_VALUE NULL -DEFAULT_VALUE 0 -VARIABLE_SCOPE GLOBAL -VARIABLE_TYPE INT UNSIGNED -VARIABLE_COMMENT Deprecated parameter with no effect. -NUMERIC_MIN_VALUE 0 -NUMERIC_MAX_VALUE 4294967295 -NUMERIC_BLOCK_SIZE 0 -ENUM_VALUE_LIST NULL -READ_ONLY NO -COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME INNODB_DATA_FILE_PATH SESSION_VALUE NULL DEFAULT_VALUE ibdata1:12M:autoextend @@ -765,18 +669,6 @@ NUMERIC_BLOCK_SIZE 0 ENUM_VALUE_LIST NULL READ_ONLY YES COMMAND_LINE_ARGUMENT REQUIRED -VARIABLE_NAME INNODB_FILE_FORMAT -SESSION_VALUE NULL -DEFAULT_VALUE -VARIABLE_SCOPE GLOBAL -VARIABLE_TYPE VARCHAR -VARIABLE_COMMENT Deprecated parameter with no effect. -NUMERIC_MIN_VALUE NULL -NUMERIC_MAX_VALUE NULL -NUMERIC_BLOCK_SIZE NULL -ENUM_VALUE_LIST NULL -READ_ONLY YES -COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME INNODB_FILE_PER_TABLE SESSION_VALUE NULL DEFAULT_VALUE ON @@ -1125,18 +1017,6 @@ NUMERIC_BLOCK_SIZE 0 ENUM_VALUE_LIST NULL READ_ONLY NO COMMAND_LINE_ARGUMENT REQUIRED -VARIABLE_NAME INNODB_LARGE_PREFIX -SESSION_VALUE NULL -DEFAULT_VALUE -VARIABLE_SCOPE GLOBAL -VARIABLE_TYPE VARCHAR -VARIABLE_COMMENT Deprecated parameter with no effect. -NUMERIC_MIN_VALUE NULL -NUMERIC_MAX_VALUE NULL -NUMERIC_BLOCK_SIZE NULL -ENUM_VALUE_LIST NULL -READ_ONLY YES -COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME INNODB_LIMIT_OPTIMISTIC_INSERT_DEBUG SESSION_VALUE NULL DEFAULT_VALUE 0 @@ -1197,42 +1077,6 @@ NUMERIC_BLOCK_SIZE NULL ENUM_VALUE_LIST OFF,ON READ_ONLY NO COMMAND_LINE_ARGUMENT OPTIONAL -VARIABLE_NAME INNODB_LOG_CHECKSUMS -SESSION_VALUE NULL -DEFAULT_VALUE ON -VARIABLE_SCOPE GLOBAL -VARIABLE_TYPE BOOLEAN -VARIABLE_COMMENT Deprecated parameter with no effect. -NUMERIC_MIN_VALUE NULL -NUMERIC_MAX_VALUE NULL -NUMERIC_BLOCK_SIZE NULL -ENUM_VALUE_LIST OFF,ON -READ_ONLY NO -COMMAND_LINE_ARGUMENT REQUIRED -VARIABLE_NAME INNODB_LOG_COMPRESSED_PAGES -SESSION_VALUE NULL -DEFAULT_VALUE ON -VARIABLE_SCOPE GLOBAL -VARIABLE_TYPE BOOLEAN -VARIABLE_COMMENT Deprecated parameter with no effect. -NUMERIC_MIN_VALUE NULL -NUMERIC_MAX_VALUE NULL -NUMERIC_BLOCK_SIZE NULL -ENUM_VALUE_LIST OFF,ON -READ_ONLY NO -COMMAND_LINE_ARGUMENT OPTIONAL -VARIABLE_NAME INNODB_LOG_FILES_IN_GROUP -SESSION_VALUE NULL -DEFAULT_VALUE 1 -VARIABLE_SCOPE GLOBAL -VARIABLE_TYPE BIGINT UNSIGNED -VARIABLE_COMMENT Deprecated parameter with no effect. -NUMERIC_MIN_VALUE 1 -NUMERIC_MAX_VALUE 100 -NUMERIC_BLOCK_SIZE 0 -ENUM_VALUE_LIST NULL -READ_ONLY YES -COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME INNODB_LOG_FILE_SIZE SESSION_VALUE NULL DEFAULT_VALUE 100663296 @@ -1257,18 +1101,6 @@ NUMERIC_BLOCK_SIZE NULL ENUM_VALUE_LIST NULL READ_ONLY YES COMMAND_LINE_ARGUMENT REQUIRED -VARIABLE_NAME INNODB_LOG_OPTIMIZE_DDL -SESSION_VALUE NULL -DEFAULT_VALUE OFF -VARIABLE_SCOPE GLOBAL -VARIABLE_TYPE BOOLEAN -VARIABLE_COMMENT Deprecated parameter with no effect. -NUMERIC_MIN_VALUE NULL -NUMERIC_MAX_VALUE NULL -NUMERIC_BLOCK_SIZE NULL -ENUM_VALUE_LIST OFF,ON -READ_ONLY NO -COMMAND_LINE_ARGUMENT OPTIONAL VARIABLE_NAME INNODB_LOG_WRITE_AHEAD_SIZE SESSION_VALUE NULL DEFAULT_VALUE 8192 @@ -1485,18 +1317,6 @@ NUMERIC_BLOCK_SIZE NULL ENUM_VALUE_LIST OFF,ON READ_ONLY NO COMMAND_LINE_ARGUMENT NONE -VARIABLE_NAME INNODB_PAGE_CLEANERS -SESSION_VALUE NULL -DEFAULT_VALUE 0 -VARIABLE_SCOPE GLOBAL -VARIABLE_TYPE BIGINT UNSIGNED -VARIABLE_COMMENT Deprecated parameter with no effect. -NUMERIC_MIN_VALUE 0 -NUMERIC_MAX_VALUE 64 -NUMERIC_BLOCK_SIZE 0 -ENUM_VALUE_LIST NULL -READ_ONLY NO -COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME INNODB_PAGE_CLEANER_DISABLED_DEBUG SESSION_VALUE NULL DEFAULT_VALUE OFF @@ -1629,18 +1449,6 @@ NUMERIC_BLOCK_SIZE NULL ENUM_VALUE_LIST OFF,ON READ_ONLY YES COMMAND_LINE_ARGUMENT OPTIONAL -VARIABLE_NAME INNODB_REPLICATION_DELAY -SESSION_VALUE NULL -DEFAULT_VALUE 0 -VARIABLE_SCOPE GLOBAL -VARIABLE_TYPE INT UNSIGNED -VARIABLE_COMMENT Deprecated parameter with no effect. -NUMERIC_MIN_VALUE 0 -NUMERIC_MAX_VALUE 4294967295 -NUMERIC_BLOCK_SIZE 0 -ENUM_VALUE_LIST NULL -READ_ONLY NO -COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME INNODB_ROLLBACK_ON_TIMEOUT SESSION_VALUE NULL DEFAULT_VALUE OFF @@ -1665,30 +1473,6 @@ NUMERIC_BLOCK_SIZE 0 ENUM_VALUE_LIST NULL READ_ONLY NO COMMAND_LINE_ARGUMENT OPTIONAL -VARIABLE_NAME INNODB_SCRUB_LOG -SESSION_VALUE NULL -DEFAULT_VALUE OFF -VARIABLE_SCOPE GLOBAL -VARIABLE_TYPE BOOLEAN -VARIABLE_COMMENT Deprecated parameter with no effect. -NUMERIC_MIN_VALUE NULL -NUMERIC_MAX_VALUE NULL -NUMERIC_BLOCK_SIZE NULL -ENUM_VALUE_LIST OFF,ON -READ_ONLY YES -COMMAND_LINE_ARGUMENT OPTIONAL -VARIABLE_NAME INNODB_SCRUB_LOG_SPEED -SESSION_VALUE NULL -DEFAULT_VALUE 256 -VARIABLE_SCOPE GLOBAL -VARIABLE_TYPE BIGINT UNSIGNED -VARIABLE_COMMENT Deprecated parameter with no effect. -NUMERIC_MIN_VALUE 1 -NUMERIC_MAX_VALUE 50000 -NUMERIC_BLOCK_SIZE 0 -ENUM_VALUE_LIST NULL -READ_ONLY NO -COMMAND_LINE_ARGUMENT OPTIONAL VARIABLE_NAME INNODB_SIMULATE_COMP_FAILURES SESSION_VALUE NULL DEFAULT_VALUE 0 @@ -1929,30 +1713,6 @@ NUMERIC_BLOCK_SIZE NULL ENUM_VALUE_LIST NULL READ_ONLY YES COMMAND_LINE_ARGUMENT REQUIRED -VARIABLE_NAME INNODB_THREAD_CONCURRENCY -SESSION_VALUE NULL -DEFAULT_VALUE 0 -VARIABLE_SCOPE GLOBAL -VARIABLE_TYPE INT UNSIGNED -VARIABLE_COMMENT Deprecated parameter with no effect. -NUMERIC_MIN_VALUE 0 -NUMERIC_MAX_VALUE 1000 -NUMERIC_BLOCK_SIZE 0 -ENUM_VALUE_LIST NULL -READ_ONLY NO -COMMAND_LINE_ARGUMENT REQUIRED -VARIABLE_NAME INNODB_THREAD_SLEEP_DELAY -SESSION_VALUE NULL -DEFAULT_VALUE 0 -VARIABLE_SCOPE GLOBAL -VARIABLE_TYPE INT UNSIGNED -VARIABLE_COMMENT Deprecated parameter with no effect. -NUMERIC_MIN_VALUE 0 -NUMERIC_MAX_VALUE 1000000 -NUMERIC_BLOCK_SIZE 0 -ENUM_VALUE_LIST NULL -READ_ONLY NO -COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME INNODB_TMPDIR SESSION_VALUE DEFAULT_VALUE @@ -2001,18 +1761,6 @@ NUMERIC_BLOCK_SIZE NULL ENUM_VALUE_LIST NULL READ_ONLY YES COMMAND_LINE_ARGUMENT REQUIRED -VARIABLE_NAME INNODB_UNDO_LOGS -SESSION_VALUE NULL -DEFAULT_VALUE 128 -VARIABLE_SCOPE GLOBAL -VARIABLE_TYPE BIGINT UNSIGNED -VARIABLE_COMMENT Deprecated parameter with no effect. -NUMERIC_MIN_VALUE 0 -NUMERIC_MAX_VALUE 128 -NUMERIC_BLOCK_SIZE 0 -ENUM_VALUE_LIST NULL -READ_ONLY NO -COMMAND_LINE_ARGUMENT OPTIONAL VARIABLE_NAME INNODB_UNDO_LOG_TRUNCATE SESSION_VALUE NULL DEFAULT_VALUE OFF diff --git a/mysql-test/suite/sys_vars/t/innodb_adaptive_max_sleep_delay_basic.test b/mysql-test/suite/sys_vars/t/innodb_adaptive_max_sleep_delay_basic.test deleted file mode 100644 index 49349d86713..00000000000 --- a/mysql-test/suite/sys_vars/t/innodb_adaptive_max_sleep_delay_basic.test +++ /dev/null @@ -1,93 +0,0 @@ -################## mysql-test/t/innodb_adaptive_max_sleep_delay.test ########## -# # -# Variable Name: innodb_adaptive_max_sleep_delay # -# Scope: Global # -# Access Type: Dynamic # -# Data Type: numeric # -# # -# Note: This variable is only defined if innodb_have_atomic_builtins=ON # -# # -# Creation Date: 2011-08-17 # -# Author : Sunny Bains # -# # -# # -# Description: Dynamic config global variable innodb_adaptive_max_sleep_delay # -# * Value check # -# * Scope check # -# # -############################################################################### - ---source include/have_innodb.inc - -# Check if builtins are enabled -if (`SELECT LOWER(VARIABLE_VALUE)='off' FROM INFORMATION_SCHEMA.GLOBAL_STATUS - WHERE LOWER(variable_name) = 'innodb_have_atomic_builtins'`) { - --skip Test requires InnoDB atomic builtins -} - -# Display default value -SELECT @@GLOBAL.innodb_adaptive_max_sleep_delay; ---echo 150000 Expected - -# Check if value can be set -SET @@GLOBAL.innodb_adaptive_max_sleep_delay=100; - -# Check for valid values -SET @@GLOBAL.innodb_adaptive_max_sleep_delay=0; -SELECT @@GLOBAL.innodb_adaptive_max_sleep_delay; -SET @@GLOBAL.innodb_adaptive_max_sleep_delay=100000; -SELECT @@GLOBAL.innodb_adaptive_max_sleep_delay; -SET @@GLOBAL.innodb_adaptive_max_sleep_delay=1000000; -SELECT @@GLOBAL.innodb_adaptive_max_sleep_delay; - -# Check for out of bounds -SET @@GLOBAL.innodb_adaptive_max_sleep_delay=1000001; -SELECT @@GLOBAL.innodb_adaptive_max_sleep_delay; ---echo 1000000 Expected - -SET @@GLOBAL.innodb_adaptive_max_sleep_delay=4294967295; -SELECT @@GLOBAL.innodb_adaptive_max_sleep_delay; ---echo 1000000 Expected - -SET @@GLOBAL.innodb_adaptive_max_sleep_delay=-1; -SELECT @@GLOBAL.innodb_adaptive_max_sleep_delay; ---echo 0 Expected - -SET @@GLOBAL.innodb_adaptive_max_sleep_delay=-1024; -SELECT @@GLOBAL.innodb_adaptive_max_sleep_delay; ---echo 0 Expected - -SELECT COUNT(@@GLOBAL.innodb_adaptive_max_sleep_delay); ---echo 1 Expected - -# Check if the value in GLOBAL table matches value in variable ---disable_warnings -SELECT VARIABLE_VALUE -FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES -WHERE VARIABLE_NAME='innodb_adaptive_max_sleep_delay'; ---enable_warnings ---echo 100 Expected - -# Check if accessing variable with and without GLOBAL point to same -# variable -SELECT @@innodb_adaptive_max_sleep_delay = @@GLOBAL.innodb_adaptive_max_sleep_delay; ---echo 1000000 Expected - -# Check if innodb_adaptive_max_sleep_delay can be accessed with and -# without @@ sign. -SELECT COUNT(@@innodb_adaptive_max_sleep_delay); ---echo 1 Expected - ---Error ER_INCORRECT_GLOBAL_LOCAL_VAR -SELECT COUNT(@@local.innodb_adaptive_max_sleep_delay); ---echo Expected error 'Variable is a GLOBAL variable' - ---Error ER_INCORRECT_GLOBAL_LOCAL_VAR -SELECT COUNT(@@SESSION.innodb_adaptive_max_sleep_delay); ---echo Expected error 'Variable is a GLOBAL variable' - ---Error ER_BAD_FIELD_ERROR -SELECT innodb_adaptive_max_sleep_delay = @@SESSION.innodb_adaptive_max_sleep_delay; - -# Reset the default -SET @@GLOBAL.innodb_adaptive_max_sleep_delay=150000; diff --git a/mysql-test/suite/sys_vars/t/innodb_background_scrub_data_check_interval_basic.test b/mysql-test/suite/sys_vars/t/innodb_background_scrub_data_check_interval_basic.test deleted file mode 100644 index 77c8671a1bc..00000000000 --- a/mysql-test/suite/sys_vars/t/innodb_background_scrub_data_check_interval_basic.test +++ /dev/null @@ -1,54 +0,0 @@ -# bool global ---source include/have_innodb.inc - -SET @start_global_value = @@global.innodb_background_scrub_data_check_interval; - ---echo # ---echo # default value ---echo # -select @@global.innodb_background_scrub_data_check_interval; -set global innodb_background_scrub_data_check_interval=10; -select @@global.innodb_background_scrub_data_check_interval; -set global innodb_background_scrub_data_check_interval=DEFAULT; -select @@global.innodb_background_scrub_data_check_interval; -set global innodb_background_scrub_data_check_interval=20; -select @@global.innodb_background_scrub_data_check_interval; -set global innodb_background_scrub_data_check_interval=DEFAULT; -select @@global.innodb_background_scrub_data_check_interval; - ---echo # ---echo # exists as global only ---echo # -select @@global.innodb_background_scrub_data_check_interval; ---error ER_INCORRECT_GLOBAL_LOCAL_VAR -select @@session.innodb_background_scrub_data_check_interval; -show global variables like 'innodb_background_scrub_data_check_interval'; -show session variables like 'innodb_background_scrub_data_check_interval'; -select * from information_schema.global_variables -where variable_name='innodb_background_scrub_data_check_interval'; -select * from information_schema.session_variables -where variable_name='innodb_background_scrub_data_check_interval'; - ---echo # ---echo # show that it's writable ---echo # -set global innodb_background_scrub_data_check_interval=10; -select @@global.innodb_background_scrub_data_check_interval; -set global innodb_background_scrub_data_check_interval=20; -select @@global.innodb_background_scrub_data_check_interval; -set global innodb_background_scrub_data_check_interval=1; -select @@global.innodb_background_scrub_data_check_interval; ---error ER_GLOBAL_VARIABLE -set session innodb_background_scrub_data_check_interval=1; - ---echo # ---echo # incorrect types ---echo # ---error ER_WRONG_TYPE_FOR_VAR -set global innodb_background_scrub_data_check_interval=1.1; ---error ER_WRONG_TYPE_FOR_VAR -set global innodb_background_scrub_data_check_interval=1e1; ---error ER_WRONG_TYPE_FOR_VAR -set global innodb_background_scrub_data_check_interval="foo"; - -SET @@global.innodb_background_scrub_data_check_interval = @start_global_value; diff --git a/mysql-test/suite/sys_vars/t/innodb_background_scrub_data_compressed_basic.test b/mysql-test/suite/sys_vars/t/innodb_background_scrub_data_compressed_basic.test deleted file mode 100644 index fdf77bbb780..00000000000 --- a/mysql-test/suite/sys_vars/t/innodb_background_scrub_data_compressed_basic.test +++ /dev/null @@ -1,41 +0,0 @@ -# bool global ---source include/have_innodb.inc - -SET @start_global_value = @@global.innodb_background_scrub_data_compressed; - ---echo # ---echo # exists as global only ---echo # -select @@global.innodb_background_scrub_data_compressed; ---error ER_INCORRECT_GLOBAL_LOCAL_VAR -select @@session.innodb_background_scrub_data_compressed; -show global variables like 'innodb_background_scrub_data_compressed'; -show session variables like 'innodb_background_scrub_data_compressed'; -select * from information_schema.global_variables -where variable_name='innodb_background_scrub_data_compressed'; -select * from information_schema.session_variables -where variable_name='innodb_background_scrub_data_compressed'; - ---echo # ---echo # show that it's writable ---echo # -set global innodb_background_scrub_data_compressed=ON; -select @@global.innodb_background_scrub_data_compressed; -set global innodb_background_scrub_data_compressed=OFF; -select @@global.innodb_background_scrub_data_compressed; -set global innodb_background_scrub_data_compressed=1; -select @@global.innodb_background_scrub_data_compressed; ---error ER_GLOBAL_VARIABLE -set session innodb_background_scrub_data_compressed=1; - ---echo # ---echo # incorrect types ---echo # ---error ER_WRONG_TYPE_FOR_VAR -set global innodb_background_scrub_data_compressed=1.1; ---error ER_WRONG_TYPE_FOR_VAR -set global innodb_background_scrub_data_compressed=1e1; ---error ER_WRONG_VALUE_FOR_VAR -set global innodb_background_scrub_data_compressed="foo"; - -SET @@global.innodb_background_scrub_data_compressed = @start_global_value; diff --git a/mysql-test/suite/sys_vars/t/innodb_background_scrub_data_interval_basic.test b/mysql-test/suite/sys_vars/t/innodb_background_scrub_data_interval_basic.test deleted file mode 100644 index 9f1187a97ff..00000000000 --- a/mysql-test/suite/sys_vars/t/innodb_background_scrub_data_interval_basic.test +++ /dev/null @@ -1,41 +0,0 @@ -# bool global ---source include/have_innodb.inc - -SET @start_global_value = @@global.innodb_background_scrub_data_interval; - ---echo # ---echo # exists as global only ---echo # -select @@global.innodb_background_scrub_data_interval; ---error ER_INCORRECT_GLOBAL_LOCAL_VAR -select @@session.innodb_background_scrub_data_interval; -show global variables like 'innodb_background_scrub_data_interval'; -show session variables like 'innodb_background_scrub_data_interval'; -select * from information_schema.global_variables -where variable_name='innodb_background_scrub_data_interval'; -select * from information_schema.session_variables -where variable_name='innodb_background_scrub_data_interval'; - ---echo # ---echo # show that it's writable ---echo # -set global innodb_background_scrub_data_interval=100; -select @@global.innodb_background_scrub_data_interval; -set global innodb_background_scrub_data_interval=200; -select @@global.innodb_background_scrub_data_interval; -set global innodb_background_scrub_data_interval=300; -select @@global.innodb_background_scrub_data_interval; ---error ER_GLOBAL_VARIABLE -set session innodb_background_scrub_data_interval=400; - ---echo # ---echo # incorrect types ---echo # ---error ER_WRONG_TYPE_FOR_VAR -set global innodb_background_scrub_data_interval=1.1; ---error ER_WRONG_TYPE_FOR_VAR -set global innodb_background_scrub_data_interval=1e1; ---error ER_WRONG_TYPE_FOR_VAR -set global innodb_background_scrub_data_interval="foo"; - -SET @@global.innodb_background_scrub_data_interval = @start_global_value; diff --git a/mysql-test/suite/sys_vars/t/innodb_background_scrub_data_uncompressed_basic.test b/mysql-test/suite/sys_vars/t/innodb_background_scrub_data_uncompressed_basic.test deleted file mode 100644 index 76d6535ad81..00000000000 --- a/mysql-test/suite/sys_vars/t/innodb_background_scrub_data_uncompressed_basic.test +++ /dev/null @@ -1,41 +0,0 @@ -# bool global ---source include/have_innodb.inc - -SET @start_global_value = @@global.innodb_background_scrub_data_uncompressed; - ---echo # ---echo # exists as global only ---echo # -select @@global.innodb_background_scrub_data_uncompressed; ---error ER_INCORRECT_GLOBAL_LOCAL_VAR -select @@session.innodb_background_scrub_data_uncompressed; -show global variables like 'innodb_background_scrub_data_uncompressed'; -show session variables like 'innodb_background_scrub_data_uncompressed'; -select * from information_schema.global_variables -where variable_name='innodb_background_scrub_data_uncompressed'; -select * from information_schema.session_variables -where variable_name='innodb_background_scrub_data_uncompressed'; - ---echo # ---echo # show that it's writable ---echo # -set global innodb_background_scrub_data_uncompressed=ON; -select @@global.innodb_background_scrub_data_uncompressed; -set global innodb_background_scrub_data_uncompressed=OFF; -select @@global.innodb_background_scrub_data_uncompressed; -set global innodb_background_scrub_data_uncompressed=1; -select @@global.innodb_background_scrub_data_uncompressed; ---error ER_GLOBAL_VARIABLE -set session innodb_background_scrub_data_uncompressed=1; - ---echo # ---echo # incorrect types ---echo # ---error ER_WRONG_TYPE_FOR_VAR -set global innodb_background_scrub_data_uncompressed=1.1; ---error ER_WRONG_TYPE_FOR_VAR -set global innodb_background_scrub_data_uncompressed=1e1; ---error ER_WRONG_VALUE_FOR_VAR -set global innodb_background_scrub_data_uncompressed="foo"; - -SET @@global.innodb_background_scrub_data_uncompressed = @start_global_value; diff --git a/mysql-test/suite/sys_vars/t/innodb_buffer_pool_instances_basic.test b/mysql-test/suite/sys_vars/t/innodb_buffer_pool_instances_basic.test deleted file mode 100644 index 8785272e10d..00000000000 --- a/mysql-test/suite/sys_vars/t/innodb_buffer_pool_instances_basic.test +++ /dev/null @@ -1,107 +0,0 @@ - - -################## mysql-test\t\innodb_buffer_pool_instances_basic.test ####### -# # -# Variable Name: innodb_buffer_pool_instances # -# Scope: Global # -# Access Type: Static # -# Data Type: numeric # -# # -# # -# Creation Date: 2008-02-07 # -# Author : Sharique Abdullah # -# # -# # -# Description:Test Cases of Dynamic System Variable # -# innodb_buffer_pool_instances # -# that checks the behavior of this variable in the following ways # -# * Value Check # -# * Scope Check # -# # -# Reference: http://dev.mysql.com/doc/refman/5.1/en/ # -# server-system-variables.html # -# # -############################################################################### - ---source include/have_innodb.inc - ---echo '#---------------------BS_STVARS_035_01----------------------#' -#################################################################### -# Displaying default value # -#################################################################### -SELECT COUNT(@@GLOBAL.innodb_buffer_pool_instances); ---echo 1 Expected - - ---echo '#---------------------BS_STVARS_035_02----------------------#' -#################################################################### -# Check if Value can set # -#################################################################### - ---error ER_INCORRECT_GLOBAL_LOCAL_VAR -SET @@GLOBAL.innodb_buffer_pool_instances=1; ---echo Expected error 'Read only variable' - -SELECT COUNT(@@GLOBAL.innodb_buffer_pool_instances); ---echo 1 Expected - - - - ---echo '#---------------------BS_STVARS_035_03----------------------#' -################################################################# -# Check if the value in GLOBAL Table matches value in variable # -################################################################# - ---disable_warnings -SELECT @@GLOBAL.innodb_buffer_pool_instances = VARIABLE_VALUE -FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES -WHERE VARIABLE_NAME='innodb_buffer_pool_instances'; ---enable_warnings ---echo 1 Expected - -SELECT COUNT(@@GLOBAL.innodb_buffer_pool_instances); ---echo 1 Expected - ---disable_warnings -SELECT COUNT(VARIABLE_VALUE) -FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES -WHERE VARIABLE_NAME='innodb_buffer_pool_instances'; ---enable_warnings ---echo 1 Expected - - - ---echo '#---------------------BS_STVARS_035_04----------------------#' -################################################################################ -# Check if accessing variable with and without GLOBAL point to same variable # -################################################################################ -SELECT @@innodb_buffer_pool_instances = @@GLOBAL.innodb_buffer_pool_instances; ---echo 1 Expected - - - ---echo '#---------------------BS_STVARS_035_05----------------------#' -################################################################################ -# Check if innodb_buffer_pool_instances can be accessed with and without @@ sign # -################################################################################ - -SELECT COUNT(@@innodb_buffer_pool_instances); ---echo 1 Expected - ---Error ER_INCORRECT_GLOBAL_LOCAL_VAR -SELECT COUNT(@@local.innodb_buffer_pool_instances); ---echo Expected error 'Variable is a GLOBAL variable' - ---Error ER_INCORRECT_GLOBAL_LOCAL_VAR -SELECT COUNT(@@SESSION.innodb_buffer_pool_instances); ---echo Expected error 'Variable is a GLOBAL variable' - -SELECT COUNT(@@GLOBAL.innodb_buffer_pool_instances); ---echo 1 Expected - ---Error ER_BAD_FIELD_ERROR -SELECT innodb_buffer_pool_instances = @@SESSION.innodb_buffer_pool_instances; ---echo Expected error 'Readonly variable' - - diff --git a/mysql-test/suite/sys_vars/t/innodb_commit_concurrency_basic.test b/mysql-test/suite/sys_vars/t/innodb_commit_concurrency_basic.test deleted file mode 100644 index 67be561348a..00000000000 --- a/mysql-test/suite/sys_vars/t/innodb_commit_concurrency_basic.test +++ /dev/null @@ -1,138 +0,0 @@ -################# mysql-test\t\innodb_commit_concurrency_basic.test ########### -# # -# Variable Name: innodb_commit_concurrency # -# Scope: GLOBAL # -# Access Type: Dynamic # -# Data Type: Numeric # -# Default Value: 0 # -# Range: 0-1000 # -# # -# # -# Creation Date: 2008-02-07 # -# Author: Rizwan # -# # -#Description:Test Cases of Dynamic System Variable innodb_commit_concurrency # -# that checks the behavior of this variable in the following ways # -# * Default Value # -# * Valid & Invalid values # -# * Scope & Access method # -# * Data Integrity # -# # -# Reference: http://dev.mysql.com/doc/refman/5.1/en/ # -# server-system-variables.html # -# # -############################################################################### - ---source include/have_innodb.inc ---source include/load_sysvars.inc - -######################################################################## -# START OF innodb_commit_concurrency TESTS # -######################################################################## - - -############################################################################## -# Saving initial value of innodb_commit_concurrency in a temporary variable# -############################################################################## - -SET @global_start_value = @@global.innodb_commit_concurrency; -SELECT @global_start_value; - ---echo '#--------------------FN_DYNVARS_046_01------------------------#' -######################################################################## -# Display the DEFAULT value of innodb_commit_concurrency # -######################################################################## - -SET @@global.innodb_commit_concurrency = 0; -SET @@global.innodb_commit_concurrency = DEFAULT; -SELECT @@global.innodb_commit_concurrency; - ---echo '#---------------------FN_DYNVARS_046_02-------------------------#' -################################################################################ -# Check if innodb_commit_concurrency can be accessed with and without @@ sign# -################################################################################ - ---error ER_GLOBAL_VARIABLE -SET innodb_commit_concurrency = 1; -SET GLOBAL innodb_commit_concurrency = 1; -SELECT @@innodb_commit_concurrency; - - ---Error ER_UNKNOWN_TABLE -SELECT local.innodb_commit_concurrency; - -SET global innodb_commit_concurrency = 0; - -SELECT @@global.innodb_commit_concurrency; - - ---echo '#--------------------FN_DYNVARS_046_03------------------------#' -########################################################################## -# change the value of innodb_commit_concurrency to a valid value # -########################################################################## - - -SET @@global.innodb_commit_concurrency = 0; -SELECT @@global.innodb_commit_concurrency; - ---echo '#--------------------FN_DYNVARS_046_04-------------------------#' -########################################################################### -# Change the value of innodb_commit_concurrency to invalid value # -########################################################################### - -SELECT @@global.innodb_commit_concurrency; -SELECT @@global.innodb_commit_concurrency; -SET @@global.innodb_commit_concurrency = -1; -SELECT @@global.innodb_commit_concurrency; ---Error ER_WRONG_TYPE_FOR_VAR -SET @@global.innodb_commit_concurrency = "T"; -SELECT @@global.innodb_commit_concurrency; ---Error ER_WRONG_TYPE_FOR_VAR -SET @@global.innodb_commit_concurrency = "Y"; -SELECT @@global.innodb_commit_concurrency; ---Error ER_WRONG_TYPE_FOR_VAR -SET @@global.innodb_commit_concurrency = 1.1; -SELECT @@global.innodb_commit_concurrency; -SET @@global.innodb_commit_concurrency = 1001; -SELECT @@global.innodb_commit_concurrency; - - - ---echo '#----------------------FN_DYNVARS_046_05------------------------#' -######################################################################### -# Check if the value in GLOBAL Table matches value in variable # -######################################################################### - ---disable_warnings -SELECT @@global.innodb_commit_concurrency = - VARIABLE_VALUE FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES - WHERE VARIABLE_NAME='innodb_commit_concurrency'; -SELECT @@global.innodb_commit_concurrency; -SELECT VARIABLE_VALUE FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES - WHERE VARIABLE_NAME='innodb_commit_concurrency'; ---enable_warnings - ---echo '#---------------------FN_DYNVARS_046_06-------------------------#' -################################################################### -# Check if ON and OFF values can be used on variable # -################################################################### - ---ERROR ER_WRONG_TYPE_FOR_VAR -SET @@global.innodb_commit_concurrency = OFF; -SELECT @@global.innodb_commit_concurrency; - ---ERROR ER_WRONG_TYPE_FOR_VAR -SET @@global.innodb_commit_concurrency = ON; -SELECT @@global.innodb_commit_concurrency; - -############################## -# Restore initial value # -############################## - - -SET @@global.innodb_commit_concurrency = @global_start_value; -SELECT @@global.innodb_commit_concurrency; - -############################################################### -# END OF innodb_commit_concurrency TESTS # -############################################################### diff --git a/mysql-test/suite/sys_vars/t/innodb_concurrency_tickets_basic.test b/mysql-test/suite/sys_vars/t/innodb_concurrency_tickets_basic.test deleted file mode 100644 index d753b8bc344..00000000000 --- a/mysql-test/suite/sys_vars/t/innodb_concurrency_tickets_basic.test +++ /dev/null @@ -1,181 +0,0 @@ -################# mysql-test\t\innodb_concurrency_tickets_basic.test ########## -# # -# Variable Name: innodb_concurrency_tickets # -# Scope: GLOBAL # -# Access Type: Dynamic # -# Data Type: Numeric # -# Default Value: 5000 # -# Range: 1-4294967295 # -# # -# # -# Creation Date: 2008-02-07 # -# Author: Rizwan # -# # -#Description:Test Cases of Dynamic System Variable innodb_concurrency_tickets # -# that checks the behavior of this variable in the following ways # -# * Default Value # -# * Valid & Invalid values # -# * Scope & Access method # -# * Data Integrity # -# # -# Reference: http://dev.mysql.com/doc/refman/5.1/en/ # -# server-system-variables.html # -# # -############################################################################### - ---source include/have_innodb.inc ---source include/load_sysvars.inc - -######################################################################## -# START OF innodb_concurrency_tickets TESTS # -######################################################################## - - -################################################################################ -# Saving initial value of innodb_concurrency_tickets in a temporary variable # -################################################################################ - -SET @global_start_value = @@global.innodb_concurrency_tickets; -SELECT @global_start_value; - ---echo '#--------------------FN_DYNVARS_046_01------------------------#' -######################################################################## -# Display the DEFAULT value of innodb_concurrency_tickets # -######################################################################## - -SET @@global.innodb_concurrency_tickets = 0; -SET @@global.innodb_concurrency_tickets = DEFAULT; -SELECT @@global.innodb_concurrency_tickets; - ---echo '#---------------------FN_DYNVARS_046_02-------------------------#' -################################################################################ -# Check if innodb_concurrency_tickets can be accessed with and without @@ sign # -################################################################################ - ---Error ER_GLOBAL_VARIABLE -SET innodb_concurrency_tickets = 1; -SELECT @@innodb_concurrency_tickets; - ---Error ER_UNKNOWN_TABLE -SELECT local.innodb_concurrency_tickets; - -SET global innodb_concurrency_tickets = 0; -SELECT @@global.innodb_concurrency_tickets; - - ---echo '#--------------------FN_DYNVARS_046_03------------------------#' -########################################################################## -# change the value of innodb_concurrency_tickets to a valid value # -########################################################################## - -SET @@global.innodb_concurrency_tickets = 1; -SELECT @@global.innodb_concurrency_tickets; - -SET @@global.innodb_concurrency_tickets = 1000; -SELECT @@global.innodb_concurrency_tickets; - -SET @@global.innodb_concurrency_tickets = 4294967295; -SELECT @@global.innodb_concurrency_tickets; - ---echo '#--------------------FN_DYNVARS_046_04-------------------------#' -########################################################################### -# Check the value of innodb_concurrency_tickets for out of bounds # -########################################################################### - -# With a 64 bit mysqld:18446744073709551615,with a 32 bit mysqld: 4294967295 ---disable_warnings -SET @@global.innodb_concurrency_tickets = 4294967296; ---enable_warnings -SELECT @@global.innodb_concurrency_tickets IN (4294967296,4294967295); - ---disable_warnings -SET @@global.innodb_concurrency_tickets = 12345678901; ---enable_warnings -SELECT @@global.innodb_concurrency_tickets IN (12345678901,4294967295); - ---disable_warnings -SET @@global.innodb_concurrency_tickets = 18446744073709551615; ---enable_warnings -SELECT @@global.innodb_concurrency_tickets IN (18446744073709551615,4294967295); - ---echo '#--------------------FN_DYNVARS_046_05-------------------------#' -########################################################################### -# Change the value of innodb_concurrency_tickets to invalid value # -########################################################################### - -SET @@global.innodb_concurrency_tickets = -1; -SELECT @@global.innodb_concurrency_tickets; - -SET @@global.innodb_concurrency_tickets = -1024; -SELECT @@global.innodb_concurrency_tickets; - ---Error ER_WRONG_TYPE_FOR_VAR -SET @@global.innodb_concurrency_tickets = "T"; -SELECT @@global.innodb_concurrency_tickets; - ---Error ER_WRONG_TYPE_FOR_VAR -SET @@global.innodb_concurrency_tickets = "Y"; -SELECT @@global.innodb_concurrency_tickets; - ---Error ER_WRONG_TYPE_FOR_VAR -SET @@global.innodb_concurrency_tickets = 1.1; -SELECT @@global.innodb_concurrency_tickets; - ---Error ER_WRONG_TYPE_FOR_VAR -SET @@global.innodb_concurrency_tickets = " "; -SELECT @@global.innodb_concurrency_tickets; - ---Error ER_WRONG_TYPE_FOR_VAR -SET @@global.innodb_concurrency_tickets = ' '; -SELECT @@global.innodb_concurrency_tickets; - ---echo '#----------------------FN_DYNVARS_046_06------------------------#' -######################################################################### -# Check if the value in GLOBAL Table matches value in variable # -######################################################################### - ---disable_warnings -SELECT @@global.innodb_concurrency_tickets = - VARIABLE_VALUE FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES - WHERE VARIABLE_NAME='innodb_concurrency_tickets'; ---enable_warnings -SELECT @@global.innodb_concurrency_tickets; ---disable_warnings -SELECT VARIABLE_VALUE FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES - WHERE VARIABLE_NAME='innodb_concurrency_tickets'; ---enable_warnings - ---echo '#---------------------FN_DYNVARS_046_07-------------------------#' -################################################################### -# Check if ON and OFF values can be used on variable # -################################################################### - ---ERROR ER_WRONG_TYPE_FOR_VAR -SET @@global.innodb_concurrency_tickets = OFF; -SELECT @@global.innodb_concurrency_tickets; - ---Error ER_WRONG_TYPE_FOR_VAR -SET @@global.innodb_concurrency_tickets = ON; -SELECT @@global.innodb_concurrency_tickets; - ---echo '#---------------------FN_DYNVARS_046_08----------------------#' -################################################################### -# Check if TRUE and FALSE values can be used on variable # -################################################################### - -SET @@global.innodb_concurrency_tickets = TRUE; -SELECT @@global.innodb_concurrency_tickets; -SET @@global.innodb_concurrency_tickets = FALSE; -SELECT @@global.innodb_concurrency_tickets; - -############################## -# Restore initial value # -############################## - -SET @@global.innodb_concurrency_tickets = @global_start_value; -SELECT @@global.innodb_concurrency_tickets; - -############################################################### -# END OF innodb_concurrency_tickets TESTS # -############################################################### - diff --git a/mysql-test/suite/sys_vars/t/innodb_log_checksums_basic.test b/mysql-test/suite/sys_vars/t/innodb_log_checksums_basic.test deleted file mode 100644 index 8ebc9f1652b..00000000000 --- a/mysql-test/suite/sys_vars/t/innodb_log_checksums_basic.test +++ /dev/null @@ -1,36 +0,0 @@ ---source include/have_innodb.inc - -# Check the default value -SET @orig = @@global.innodb_log_checksums; -SELECT @orig; - --- error ER_WRONG_VALUE_FOR_VAR -SET GLOBAL innodb_log_checksums = 'crc32'; -SELECT @@global.innodb_log_checksums; - --- error ER_WRONG_VALUE_FOR_VAR -SET GLOBAL innodb_log_checksums = 2; -SELECT @@global.innodb_log_checksums; - --- error ER_WRONG_TYPE_FOR_VAR -SET GLOBAL innodb_log_checksums = 1e2; -SELECT @@global.innodb_log_checksums; - --- error ER_WRONG_TYPE_FOR_VAR -SET GLOBAL innodb_log_checksums = 1.0; -SELECT @@global.innodb_log_checksums; - --- error ER_GLOBAL_VARIABLE -SET innodb_log_checksums = OFF; -SELECT @@global.innodb_log_checksums; - -SET GLOBAL innodb_log_checksums = OFF; -SELECT @@global.innodb_log_checksums; - -SET GLOBAL innodb_log_checksums = default; - -SET GLOBAL innodb_log_checksums = ON; -SELECT @@global.innodb_log_checksums; - -SET GLOBAL innodb_log_checksums = @orig; -SELECT @@global.innodb_log_checksums; diff --git a/mysql-test/suite/sys_vars/t/innodb_log_compressed_pages_basic.test b/mysql-test/suite/sys_vars/t/innodb_log_compressed_pages_basic.test deleted file mode 100644 index 2c83a36a0fd..00000000000 --- a/mysql-test/suite/sys_vars/t/innodb_log_compressed_pages_basic.test +++ /dev/null @@ -1,92 +0,0 @@ ---source include/have_innodb.inc - -SET @start_global_value = @@global.innodb_log_compressed_pages; -SELECT @start_global_value; - - ---echo '#---------------------BS_STVARS_028_01----------------------#' -#################################################################### -# Displaying default value # -#################################################################### -SELECT COUNT(@@GLOBAL.innodb_log_compressed_pages); ---echo 1 Expected - - ---echo '#---------------------BS_STVARS_028_02----------------------#' -#################################################################### -# Check if Value can set # -#################################################################### - -SET @@global.innodb_log_compressed_pages = 0; -SELECT @@global.innodb_log_compressed_pages; - -SET @@global.innodb_log_compressed_pages ='On' ; -SELECT @@global.innodb_log_compressed_pages; - -SET @@global.innodb_log_compressed_pages ='Off' ; -SELECT @@global.innodb_log_compressed_pages; - -SET @@global.innodb_log_compressed_pages = 1; -SELECT @@global.innodb_log_compressed_pages; - ---echo '#---------------------BS_STVARS_028_03----------------------#' -################################################################# -# Check if the value in GLOBAL Table matches value in variable # -################################################################# - ---disable_warnings -SELECT IF(@@GLOBAL.innodb_log_compressed_pages,'ON','OFF') = VARIABLE_VALUE -FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES -WHERE VARIABLE_NAME='innodb_log_compressed_pages'; ---enable_warnings ---echo 1 Expected - -SELECT COUNT(@@GLOBAL.innodb_log_compressed_pages); ---echo 1 Expected - ---disable_warnings -SELECT COUNT(VARIABLE_VALUE) -FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES -WHERE VARIABLE_NAME='innodb_log_compressed_pages'; ---enable_warnings ---echo 1 Expected - - - ---echo '#---------------------BS_STVARS_028_04----------------------#' -################################################################################ -# Check if accessing variable with and without GLOBAL point to same variable # -################################################################################ -SELECT @@innodb_log_compressed_pages = @@GLOBAL.innodb_log_compressed_pages; ---echo 1 Expected - - - ---echo '#---------------------BS_STVARS_028_05----------------------#' -################################################################################ -# Check if innodb_log_compressed_pages can be accessed with and without @@ sign# -################################################################################ - -SELECT COUNT(@@innodb_log_compressed_pages); ---echo 1 Expected - ---Error ER_INCORRECT_GLOBAL_LOCAL_VAR -SELECT COUNT(@@local.innodb_log_compressed_pages); ---echo Expected error 'Variable is a GLOBAL variable' - ---Error ER_INCORRECT_GLOBAL_LOCAL_VAR -SELECT COUNT(@@SESSION.innodb_log_compressed_pages); ---echo Expected error 'Variable is a GLOBAL variable' - -SELECT COUNT(@@GLOBAL.innodb_log_compressed_pages); ---echo 1 Expected - ---Error ER_BAD_FIELD_ERROR -SELECT innodb_log_compressed_pages = @@SESSION.innodb_log_compressed_pages; - -# -# Cleanup -# - -SET @@global.innodb_log_compressed_pages = @start_global_value; -SELECT @@global.innodb_log_compressed_pages; diff --git a/mysql-test/suite/sys_vars/t/innodb_log_files_in_group_basic.opt b/mysql-test/suite/sys_vars/t/innodb_log_files_in_group_basic.opt deleted file mode 100644 index 3ad42ad65d8..00000000000 --- a/mysql-test/suite/sys_vars/t/innodb_log_files_in_group_basic.opt +++ /dev/null @@ -1 +0,0 @@ ---innodb-log-files-in-group=2 diff --git a/mysql-test/suite/sys_vars/t/innodb_log_files_in_group_basic.test b/mysql-test/suite/sys_vars/t/innodb_log_files_in_group_basic.test deleted file mode 100644 index 60046bd09e6..00000000000 --- a/mysql-test/suite/sys_vars/t/innodb_log_files_in_group_basic.test +++ /dev/null @@ -1,106 +0,0 @@ - - -################## mysql-test\t\innodb_log_files_in_group_basic.test ########## -# # -# Variable Name: innodb_log_files_in_group # -# Scope: Global # -# Access Type: Static # -# Data Type: numeric # -# # -# # -# Creation Date: 2008-02-07 # -# Author : Sharique Abdullah # -# # -# # -# Description:Test Cases of Dynamic System Variable innodb_log_files_in_group # -# that checks the behavior of this variable in the following ways # -# * Value Check # -# * Scope Check # -# # -# Reference: http://dev.mysql.com/doc/refman/5.1/en/ # -# server-system-variables.html # -# # -############################################################################### - ---source include/have_innodb.inc - ---echo '#---------------------BS_STVARS_034_01----------------------#' -#################################################################### -# Displaying default value # -#################################################################### -SELECT COUNT(@@GLOBAL.innodb_log_files_in_group); ---echo 1 Expected - - ---echo '#---------------------BS_STVARS_034_02----------------------#' -#################################################################### -# Check if Value can set # -#################################################################### - ---error ER_INCORRECT_GLOBAL_LOCAL_VAR -SET @@GLOBAL.innodb_log_files_in_group=1; ---echo Expected error 'Read only variable' - -SELECT COUNT(@@GLOBAL.innodb_log_files_in_group); ---echo 1 Expected - - - - ---echo '#---------------------BS_STVARS_034_03----------------------#' -################################################################# -# Check if the value in GLOBAL Table matches value in variable # -################################################################# - ---disable_warnings -SELECT @@GLOBAL.innodb_log_files_in_group = VARIABLE_VALUE -FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES -WHERE VARIABLE_NAME='innodb_log_files_in_group'; ---enable_warnings ---echo 1 Expected - -SELECT COUNT(@@GLOBAL.innodb_log_files_in_group); ---echo 1 Expected - ---disable_warnings -SELECT COUNT(VARIABLE_VALUE) -FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES -WHERE VARIABLE_NAME='innodb_log_files_in_group'; ---enable_warnings ---echo 1 Expected - - - ---echo '#---------------------BS_STVARS_034_04----------------------#' -################################################################################ -# Check if accessing variable with and without GLOBAL point to same variable # -################################################################################ -SELECT @@innodb_log_files_in_group = @@GLOBAL.innodb_log_files_in_group; ---echo 1 Expected - - - ---echo '#---------------------BS_STVARS_034_05----------------------#' -################################################################################ -# Check if innodb_log_files_in_group can be accessed with and without @@ sign # -################################################################################ - -SELECT COUNT(@@innodb_log_files_in_group); ---echo 1 Expected - ---Error ER_INCORRECT_GLOBAL_LOCAL_VAR -SELECT COUNT(@@local.innodb_log_files_in_group); ---echo Expected error 'Variable is a GLOBAL variable' - ---Error ER_INCORRECT_GLOBAL_LOCAL_VAR -SELECT COUNT(@@SESSION.innodb_log_files_in_group); ---echo Expected error 'Variable is a GLOBAL variable' - -SELECT COUNT(@@GLOBAL.innodb_log_files_in_group); ---echo 1 Expected - ---Error ER_BAD_FIELD_ERROR -SELECT innodb_log_files_in_group = @@SESSION.innodb_log_files_in_group; ---echo Expected error 'Readonly variable' - - diff --git a/mysql-test/suite/sys_vars/t/innodb_log_optimize_ddl_basic.test b/mysql-test/suite/sys_vars/t/innodb_log_optimize_ddl_basic.test deleted file mode 100644 index b8983093414..00000000000 --- a/mysql-test/suite/sys_vars/t/innodb_log_optimize_ddl_basic.test +++ /dev/null @@ -1,62 +0,0 @@ -############# suite/sys_vars/t/innodb_log_optimize_ddl_basic.test ############# -# # -# Variable Name: innodb_log_optimize_ddl # -# Scope: Global # -# Access Type: Dynamic # -# Data Type: boolean # -# # -# The variable was introduced by # -# MDEV-16809 Allow full redo logging for ALTER TABLE # -# # -############################################################################### - ---source include/have_innodb.inc - -#### Reveal that the global innodb system variable exists -SELECT COUNT(@@GLOBAL.innodb_log_optimize_ddl); ---echo 1 Expected - -#### Reveal that no session innodb system variable exists ---error ER_INCORRECT_GLOBAL_LOCAL_VAR -SELECT COUNT(@@SESSION.innodb_log_optimize_ddl); ---echo Expected error 'Variable is a GLOBAL variable' - -SELECT @@GLOBAL.innodb_log_optimize_ddl INTO @innodb_log_optimize_ddl_save; -#### Check if the value can be set -SET @@GLOBAL.innodb_log_optimize_ddl = ON; -SET @@GLOBAL.innodb_log_optimize_ddl = OFF; - -#### Check if disallowed values are refused ---error ER_WRONG_VALUE_FOR_VAR -SET @@GLOBAL.innodb_log_optimize_ddl = 13; ---error ER_WRONG_VALUE_FOR_VAR -SET @@GLOBAL.innodb_log_optimize_ddl = 'ABC'; - -#### Check if the initial value was in the range of supported values -# We use 0 and 1 in order to avoid a warning. -SELECT @@GLOBAL.innodb_log_optimize_ddl = 0 - OR @@GLOBAL.innodb_log_optimize_ddl = 1 AS col; ---echo 1 Expected - -#### Check if the value presented without GLOBAL point is the same -SELECT @@innodb_log_optimize_ddl = @@GLOBAL.innodb_log_optimize_ddl AS col; ---echo 1 Expected - -#### Show the value presented in information_schema and SHOW VARIABLES -# We do not want to get and than maybe suppress the print of -# Warning 1292 Truncated incorrect DOUBLE value: 'OFF' -# and so we simply print the value and do not compare. -SELECT VARIABLE_VALUE FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES -WHERE VARIABLE_NAME='innodb_log_optimize_ddl'; -SHOW VARIABLES WHERE VARIABLE_NAME='innodb_log_optimize_ddl'; - -#### Show that variants with @@local. and without @@ do not exist. ---Error ER_INCORRECT_GLOBAL_LOCAL_VAR -SELECT @@local.innodb_log_optimize_ddl; ---echo Expected error 'Variable is a GLOBAL variable' ---Error ER_BAD_FIELD_ERROR -SELECT innodb_log_optimize_ddl; - -#### Restore the initial value -SET GLOBAL innodb_log_optimize_ddl = @innodb_log_optimize_ddl_save; - diff --git a/mysql-test/suite/sys_vars/t/innodb_page_cleaners_basic.test b/mysql-test/suite/sys_vars/t/innodb_page_cleaners_basic.test deleted file mode 100644 index 367116a7e36..00000000000 --- a/mysql-test/suite/sys_vars/t/innodb_page_cleaners_basic.test +++ /dev/null @@ -1,79 +0,0 @@ -# Variable name: innodb_page_cleaners -# Scope: Global -# Access type: Dynamic -# Data type: numeric - ---source include/have_innodb.inc - -SELECT COUNT(@@GLOBAL.innodb_page_cleaners); ---echo 1 Expected - -SELECT @@innodb_page_cleaners; ---echo 1 Expected - -SET @@GLOBAL.innodb_page_cleaners=2; ---echo Expected to pass - -SELECT @@innodb_page_cleaners; ---echo 2 Expected - -SET @@GLOBAL.innodb_page_cleaners=1; ---echo Expected to pass - -SELECT @@innodb_page_cleaners; ---echo 1 Expected - -SET @@GLOBAL.innodb_page_cleaners=6; ---echo Expected to pass - -SELECT @@innodb_page_cleaners; ---echo 6 Expected - -SET @@GLOBAL.innodb_page_cleaners=4; ---echo Expected to pass - -SELECT @@innodb_page_cleaners; ---echo 4 Expected - -SET @@GLOBAL.innodb_page_cleaners=0; ---echo Warning expected - -SELECT @@innodb_page_cleaners; ---echo 1 Expected - ---Error ER_BAD_FIELD_ERROR -SELECT innodb_page_cleaners = @@SESSION.innodb_page_cleaners; ---echo Expected error 'Read-only variable' - ---disable_warnings -SELECT @@GLOBAL.innodb_page_cleaners = VARIABLE_VALUE -FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES -WHERE VARIABLE_NAME='innodb_page_cleaners'; ---enable_warnings ---echo 1 Expected - ---disable_warnings -SELECT COUNT(VARIABLE_VALUE) -FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES -WHERE VARIABLE_NAME='innodb_page_cleaners'; ---enable_warnings ---echo 1 Expected - -SELECT @@innodb_page_cleaners = @@GLOBAL.innodb_page_cleaners; ---echo 1 Expected - ---Error ER_INCORRECT_GLOBAL_LOCAL_VAR -SELECT COUNT(@@local.innodb_page_cleaners); ---echo Expected error 'Variable is a GLOBAL variable' - ---Error ER_INCORRECT_GLOBAL_LOCAL_VAR -SELECT COUNT(@@SESSION.innodb_page_cleaners); ---echo Expected error 'Variable is a GLOBAL variable' - -# Check the default value ---disable_warnings -SELECT VARIABLE_NAME, VARIABLE_VALUE -FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES -WHERE VARIABLE_NAME = 'innodb_page_cleaners'; ---enable_warnings - diff --git a/mysql-test/suite/sys_vars/t/innodb_replication_delay_basic.test b/mysql-test/suite/sys_vars/t/innodb_replication_delay_basic.test deleted file mode 100644 index c85cc85e78c..00000000000 --- a/mysql-test/suite/sys_vars/t/innodb_replication_delay_basic.test +++ /dev/null @@ -1,102 +0,0 @@ - -# -# 2010-01-27 - Added -# - ---source include/have_innodb.inc - -SET @start_global_value = @@global.innodb_replication_delay; -SELECT @start_global_value; - -# -# exists as global only -# ---echo Valid values are zero or above -select @@global.innodb_replication_delay >=0; -select @@global.innodb_replication_delay; ---error ER_INCORRECT_GLOBAL_LOCAL_VAR -select @@session.innodb_replication_delay; -show global variables like 'innodb_replication_delay'; -show session variables like 'innodb_replication_delay'; ---disable_warnings -select * from information_schema.global_variables where variable_name='innodb_replication_delay'; -select * from information_schema.session_variables where variable_name='innodb_replication_delay'; ---enable_warnings - -# -# show that it's writable -# -set global innodb_replication_delay=10; -select @@global.innodb_replication_delay; ---disable_warnings -select * from information_schema.global_variables where variable_name='innodb_replication_delay'; -select * from information_schema.session_variables where variable_name='innodb_replication_delay'; ---enable_warnings ---error ER_GLOBAL_VARIABLE -set session innodb_replication_delay=1; - -# -# check the default value -# -set global innodb_replication_delay=DEFAULT; -select @@global.innodb_replication_delay; - -# -# valid values -# - -set global innodb_replication_delay=0; -select @@global.innodb_replication_delay; -set global innodb_replication_delay=65535; -select @@global.innodb_replication_delay; -set global innodb_replication_delay=4294967295; -select @@global.innodb_replication_delay; - -# -# incorrect types -# ---error ER_WRONG_TYPE_FOR_VAR -set global innodb_replication_delay=1.1; ---error ER_WRONG_TYPE_FOR_VAR -set global innodb_replication_delay=1e1; ---error ER_WRONG_TYPE_FOR_VAR -set global innodb_replication_delay="foo"; ---error ER_WRONG_TYPE_FOR_VAR -set global innodb_replication_delay=' '; -select @@global.innodb_replication_delay; ---error ER_WRONG_TYPE_FOR_VAR -set global innodb_replication_delay=" "; -select @@global.innodb_replication_delay; -set global innodb_replication_delay=-7; -select @@global.innodb_replication_delay; -set global innodb_replication_delay=-1024; -select @@global.innodb_replication_delay; ---disable_warnings -select * from information_schema.global_variables where variable_name='innodb_replication_delay'; ---enable_warnings - -# -# Check for out of bounds -# - -# With a 64 bit mysqld:18446744073709551615,with a 32 bit mysqld: 4294967295 ---disable_warnings -SET @@global.innodb_replication_delay = 4294967296; ---enable_warnings -SELECT @@global.innodb_replication_delay IN (4294967296,4294967295); - ---disable_warnings -SET @@global.innodb_replication_delay = 12345678901; ---enable_warnings -SELECT @@global.innodb_replication_delay IN (12345678901,4294967295); - ---disable_warnings -SET @@global.innodb_replication_delay = 18446744073709551615; ---enable_warnings -SELECT @@global.innodb_replication_delay IN (18446744073709551615,4294967295); - -# -# cleanup -# -SET @@global.innodb_replication_delay = @start_global_value; -SELECT @@global.innodb_replication_delay; diff --git a/mysql-test/suite/sys_vars/t/innodb_scrub_log_basic.test b/mysql-test/suite/sys_vars/t/innodb_scrub_log_basic.test deleted file mode 100644 index 302f2a963c4..00000000000 --- a/mysql-test/suite/sys_vars/t/innodb_scrub_log_basic.test +++ /dev/null @@ -1,50 +0,0 @@ ---source include/have_innodb.inc - -# Display default value -SELECT @@GLOBAL.innodb_scrub_log; ---echo 0 Expected - -# Check if value can be set ---error ER_INCORRECT_GLOBAL_LOCAL_VAR -SET @@GLOBAL.innodb_scrub_log=1; ---echo Expected error 'Read only variable' - -SELECT @@GLOBAL.innodb_scrub_log; ---echo 0 Expected - -# Check if the value in GLOBAL TABLE matches value in variable -SELECT IF(@@GLOBAL.innodb_scrub_log, 'ON', 'OFF') = VARIABLE_VALUE -FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES -WHERE VARIABLE_NAME='innodb_scrub_log'; ---echo 1 Expected - -SELECT @@GLOBAL.innodb_scrub_log; ---echo 0 Expected - -SELECT VARIABLE_VALUE -FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES -WHERE VARIABLE_NAME='innodb_scrub_log'; ---echo 0 Expected - -# Check if accessing variable with and without GLOBAL point to same variable -SELECT @@innodb_scrub_log = @@GLOBAL.innodb_scrub_log; ---echo 1 Expected - -# Check if innodb_scrub_log can be accessed with and without @@ sign -SELECT @@innodb_scrub_log; ---echo 0 Expected - ---Error ER_INCORRECT_GLOBAL_LOCAL_VAR -SELECT @@local.innodb_scrub_log; ---echo Expected error 'Variable is a GLOBAL variable' - ---Error ER_INCORRECT_GLOBAL_LOCAL_VAR -SELECT @@SESSION.innodb_scrub_log; ---echo Expected error 'Variable is a GLOBAL variable' - -SELECT @@GLOBAL.innodb_scrub_log; ---echo 0 Expected - ---Error ER_BAD_FIELD_ERROR -SELECT innodb_scrub_log; ---echo Expected error 'Unknow column in field list' diff --git a/mysql-test/suite/sys_vars/t/innodb_scrub_log_speed_basic.test b/mysql-test/suite/sys_vars/t/innodb_scrub_log_speed_basic.test deleted file mode 100644 index 5e750eebd65..00000000000 --- a/mysql-test/suite/sys_vars/t/innodb_scrub_log_speed_basic.test +++ /dev/null @@ -1,55 +0,0 @@ ---source include/have_innodb.inc - -# Display default value -SELECT @@GLOBAL.innodb_scrub_log_speed; ---echo 200 Expected - -# Check if value can be set -SET @@GLOBAL.innodb_scrub_log_speed=100; ---echo 1 Expected - -SELECT @@GLOBAL.innodb_scrub_log_speed; ---echo 100 Expected - -SET @@GLOBAL.innodb_scrub_log_speed=DEFAULT; ---echo 1 Expected - -SELECT @@GLOBAL.innodb_scrub_log_speed; ---echo 200 Expected - -# Check if the value in GLOBAL TABLE matches value in variable -SELECT @@GLOBAL.innodb_scrub_log_speed = VARIABLE_VALUE -FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES -WHERE VARIABLE_NAME='innodb_scrub_log_speed'; ---echo 1 Expected - -SELECT @@GLOBAL.innodb_scrub_log_speed; ---echo 200 Expected - -SELECT VARIABLE_VALUE -FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES -WHERE VARIABLE_NAME='innodb_scrub_log_speed'; ---echo 200 Expected - -# Check if accessing variable with and without GLOBAL point to same variable -SELECT @@innodb_scrub_log_speed = @@GLOBAL.innodb_scrub_log_speed; ---echo 1 Expected - -# Check if innodb_scrub_log_speed can be accessed with and without @@ sign -SELECT @@innodb_scrub_log_speed; ---echo 200 Expected - ---Error ER_INCORRECT_GLOBAL_LOCAL_VAR -SELECT @@local.innodb_scrub_log_speed; ---echo Expected error 'Variable is a GLOBAL variable' - ---Error ER_INCORRECT_GLOBAL_LOCAL_VAR -SELECT @@SESSION.innodb_scrub_log_speed; ---echo Expected error 'Variable is a GLOBAL variable' - -SELECT @@GLOBAL.innodb_scrub_log_speed; ---echo 200 Expected - ---Error ER_BAD_FIELD_ERROR -SELECT innodb_scrub_log_speed; ---echo Expected error 'Unknow column in field list' diff --git a/mysql-test/suite/sys_vars/t/innodb_thread_concurrency_basic.test b/mysql-test/suite/sys_vars/t/innodb_thread_concurrency_basic.test deleted file mode 100644 index 0be32543d26..00000000000 --- a/mysql-test/suite/sys_vars/t/innodb_thread_concurrency_basic.test +++ /dev/null @@ -1,164 +0,0 @@ -################# mysql-test\t\innodb_thread_concurrency_basic.test ########### -# # -# Variable Name: innodb_thread_concurrency # -# Scope: GLOBAL # -# Access Type: Dynamic # -# Data Type: Numeric # -# Default Value: 0 # -# Range: 0-1000 # -# # -# # -# Creation Date: 2008-02-07 # -# Author: Rizwan # -# # -#Description:Test Cases of Dynamic System Variable innodb_thread_concurrency # -# that checks the behavior of this variable in the following ways # -# * Default Value # -# * Valid & Invalid values # -# * Scope & Access method # -# * Data Integrity # -# # -# Reference: http://dev.mysql.com/doc/refman/5.1/en/ # -# server-system-variables.html # -# # -############################################################################### - ---source include/have_innodb.inc ---source include/load_sysvars.inc - -######################################################################## -# START OF innodb_thread_concurrency TESTS # -######################################################################## - - -################################################################################ -# Saving initial value of innodb_thread_concurrency in a temporary variable # -################################################################################ - - -SET @global_start_value = @@global.innodb_thread_concurrency; -SELECT @global_start_value; - - - ---echo '#--------------------FN_DYNVARS_046_01------------------------#' -######################################################################## -# Display the DEFAULT value of innodb_thread_concurrency # -######################################################################## - - - -SET @@global.innodb_thread_concurrency = 0; -SET @@global.innodb_thread_concurrency = DEFAULT; -SELECT @@global.innodb_thread_concurrency; - ---echo '#---------------------FN_DYNVARS_046_02-------------------------#' -############################################################################### -# Check if innodb_thread_concurrency can be accessed with and without @@ sign # -############################################################################### - ---Error ER_GLOBAL_VARIABLE -SET innodb_thread_concurrency = 1; -SELECT @@innodb_thread_concurrency; - - ---Error ER_UNKNOWN_TABLE -SELECT local.innodb_thread_concurrency; - - -SET global innodb_thread_concurrency = 0; -SELECT @@global.innodb_thread_concurrency; - - ---echo '#--------------------FN_DYNVARS_046_03------------------------#' -########################################################################## -# change the value of innodb_thread_concurrency to a valid value # -########################################################################## - - -SET @@global.innodb_thread_concurrency = 0; -SELECT @@global.innodb_thread_concurrency; - -SET @@global.innodb_thread_concurrency = 1; -SELECT @@global.innodb_thread_concurrency; -SET @@global.innodb_thread_concurrency = 1000; -SELECT @@global.innodb_thread_concurrency; - ---echo '#--------------------FN_DYNVARS_046_04-------------------------#' -########################################################################### -# Change the value of innodb_thread_concurrency to invalid value # -########################################################################### - -SET @@global.innodb_thread_concurrency = -1; -SELECT @@global.innodb_thread_concurrency; - ---Error ER_WRONG_TYPE_FOR_VAR -SET @@global.innodb_thread_concurrency = "T"; -SELECT @@global.innodb_thread_concurrency; - ---Error ER_WRONG_TYPE_FOR_VAR -SET @@global.innodb_thread_concurrency = "Y"; -SELECT @@global.innodb_thread_concurrency; ---Error ER_WRONG_TYPE_FOR_VAR -SET @@global.innodb_thread_concurrency = ' '; -SELECT @@global.innodb_thread_concurrency; ---Error ER_WRONG_TYPE_FOR_VAR -SET @@global.innodb_thread_concurrency = " "; -SELECT @@global.innodb_thread_concurrency; - -SET @@global.innodb_thread_concurrency = 1001; -SELECT @@global.innodb_thread_concurrency; - ---Error ER_WRONG_TYPE_FOR_VAR -SET @@global.innodb_thread_concurrency = 255.01; -SELECT @@global.innodb_thread_concurrency; - ---echo '#----------------------FN_DYNVARS_046_05------------------------#' -######################################################################### -# Check if the value in GLOBAL Table matches value in variable # -######################################################################### - ---disable_warnings -SELECT @@global.innodb_thread_concurrency = - VARIABLE_VALUE FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES - WHERE VARIABLE_NAME='innodb_thread_concurrency'; ---enable_warnings -SELECT @@global.innodb_thread_concurrency; ---disable_warnings -SELECT VARIABLE_VALUE FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES - WHERE VARIABLE_NAME='innodb_thread_concurrency'; ---enable_warnings - ---echo '#---------------------FN_DYNVARS_046_06-------------------------#' -################################################################### -# Check if ON and OFF values can be used on variable # -################################################################### - ---ERROR ER_WRONG_TYPE_FOR_VAR -SET @@global.innodb_thread_concurrency = OFF; -SELECT @@global.innodb_thread_concurrency; - ---ERROR ER_WRONG_TYPE_FOR_VAR -SET @@global.innodb_thread_concurrency = ON; -SELECT @@global.innodb_thread_concurrency; - ---echo '#---------------------FN_DYNVARS_046_07----------------------#' -################################################################### -# Check if TRUE and FALSE values can be used on variable # -################################################################### - -SET @@global.innodb_thread_concurrency = TRUE; -SELECT @@global.innodb_thread_concurrency; -SET @@global.innodb_thread_concurrency = FALSE; -SELECT @@global.innodb_thread_concurrency; - -############################## -# Restore initial value # -############################## - -SET @@global.innodb_thread_concurrency = @global_start_value; -SELECT @@global.innodb_thread_concurrency; - -############################################################### -# END OF innodb_thread_concurrency TESTS # -############################################################### diff --git a/mysql-test/suite/sys_vars/t/innodb_thread_sleep_delay_basic.test b/mysql-test/suite/sys_vars/t/innodb_thread_sleep_delay_basic.test deleted file mode 100644 index bc4efdd1d6f..00000000000 --- a/mysql-test/suite/sys_vars/t/innodb_thread_sleep_delay_basic.test +++ /dev/null @@ -1,69 +0,0 @@ -# -# 2010-01-27 - Added -# - ---source include/have_innodb.inc - -SET @start_global_value = @@global.innodb_thread_sleep_delay; -SELECT @start_global_value; - -# -# exists as global only -# ---echo Valid values are zero or above -select @@global.innodb_thread_sleep_delay >=0; -select @@global.innodb_thread_sleep_delay; ---error ER_INCORRECT_GLOBAL_LOCAL_VAR -select @@session.innodb_thread_sleep_delay; -show global variables like 'innodb_thread_sleep_delay'; -show session variables like 'innodb_thread_sleep_delay'; -select * from information_schema.global_variables where variable_name='innodb_thread_sleep_delay'; -select * from information_schema.session_variables where variable_name='innodb_thread_sleep_delay'; - -# -# show that it's writable -# -set global innodb_thread_sleep_delay=10; -select @@global.innodb_thread_sleep_delay; -select * from information_schema.global_variables where variable_name='innodb_thread_sleep_delay'; -select * from information_schema.session_variables where variable_name='innodb_thread_sleep_delay'; ---error ER_GLOBAL_VARIABLE -set session innodb_thread_sleep_delay=1; - -# -# incorrect types -# ---error ER_WRONG_TYPE_FOR_VAR -set global innodb_thread_sleep_delay=1.1; ---error ER_WRONG_TYPE_FOR_VAR -set global innodb_thread_sleep_delay=1e1; ---error ER_WRONG_TYPE_FOR_VAR -set global innodb_thread_sleep_delay="foo"; - -set global innodb_thread_sleep_delay=18446744073709551616; - -set global innodb_thread_sleep_delay=-7; -select @@global.innodb_thread_sleep_delay; -select * from information_schema.global_variables where variable_name='innodb_thread_sleep_delay'; - -# -# correct/overflowed values -# -set global innodb_thread_sleep_delay=0; -select @@global.innodb_thread_sleep_delay; -set global innodb_thread_sleep_delay=1000; -select @@global.innodb_thread_sleep_delay; -set global innodb_thread_sleep_delay=1000000; -select @@global.innodb_thread_sleep_delay; -set global innodb_thread_sleep_delay=1000001; -select @@global.innodb_thread_sleep_delay; -set global innodb_thread_sleep_delay=4294967295; -select @@global.innodb_thread_sleep_delay; -set global innodb_thread_sleep_delay=555; -select @@global.innodb_thread_sleep_delay; - -# -# cleanup -# -SET @@global.innodb_thread_sleep_delay = @start_global_value; -SELECT @@global.innodb_thread_sleep_delay; diff --git a/mysql-test/suite/sys_vars/t/innodb_undo_logs_basic.opt b/mysql-test/suite/sys_vars/t/innodb_undo_logs_basic.opt deleted file mode 100644 index 71866672bd9..00000000000 --- a/mysql-test/suite/sys_vars/t/innodb_undo_logs_basic.opt +++ /dev/null @@ -1 +0,0 @@ ---innodb-undo-logs=42 diff --git a/mysql-test/suite/sys_vars/t/innodb_undo_logs_basic.test b/mysql-test/suite/sys_vars/t/innodb_undo_logs_basic.test deleted file mode 100644 index 54ee06d94cb..00000000000 --- a/mysql-test/suite/sys_vars/t/innodb_undo_logs_basic.test +++ /dev/null @@ -1,42 +0,0 @@ -# -# 2011-08-01 Added -# - ---source include/have_innodb.inc - -# -# exists as global only -# -SELECT @@global.innodb_undo_logs; - ---error ER_INCORRECT_GLOBAL_LOCAL_VAR -SELECT @@session.innodb_undo_logs; -SHOW global variables LIKE 'innodb_undo_logs'; -SHOW session variables LIKE 'innodb_undo_logs'; ---disable_warnings -SELECT * FROM information_schema.global_variables -WHERE variable_name='innodb_undo_logs'; -SELECT * FROM information_schema.session_variables -WHERE variable_name='innodb_undo_logs'; ---enable_warnings - -SET global innodb_undo_logs=100; -SELECT @@global.innodb_undo_logs; ---error ER_GLOBAL_VARIABLE -SET session innodb_undo_logs=1; - -# -# incorrect types -# ---error ER_WRONG_TYPE_FOR_VAR -SET global innodb_undo_logs=1.1; ---error ER_WRONG_TYPE_FOR_VAR -SET global innodb_undo_logs=1e1; ---error ER_WRONG_TYPE_FOR_VAR -SET global innodb_undo_logs="foo"; -SET global innodb_undo_logs=-7; -SELECT @@global.innodb_undo_logs; ---disable_warnings -SELECT * FROM information_schema.global_variables -WHERE variable_name='innodb_undo_logs'; ---enable_warnings diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 6f379b2e352..991234e92c4 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -5026,6 +5026,29 @@ static int init_server_components() /* The following options were added after 5.6.10 */ MYSQL_TO_BE_IMPLEMENTED_OPTION("rpl-stop-slave-timeout"), MYSQL_TO_BE_IMPLEMENTED_OPTION("validate-user-plugins"), // NO_EMBEDDED_ACCESS_CHECKS + + /* The following options were deprecated in 10.5 or earlier */ + MARIADB_REMOVED_OPTION("innodb-adaptive-max-sleep-delay"), + MARIADB_REMOVED_OPTION("innodb-background-scrub-data-check-interval"), + MARIADB_REMOVED_OPTION("innodb-background-scrub-data-compressed"), + MARIADB_REMOVED_OPTION("innodb-background-scrub-data-interval"), + MARIADB_REMOVED_OPTION("innodb-background-scrub-data-uncompressed"), + MARIADB_REMOVED_OPTION("innodb-buffer-pool-instances"), + MARIADB_REMOVED_OPTION("innodb-commit-concurrency"), + MARIADB_REMOVED_OPTION("innodb-concurrency-tickets"), + MARIADB_REMOVED_OPTION("innodb-file-format"), + MARIADB_REMOVED_OPTION("innodb-large-prefix"), + MARIADB_REMOVED_OPTION("innodb-log-checksums"), + MARIADB_REMOVED_OPTION("innodb-log-compressed-pages"), + MARIADB_REMOVED_OPTION("innodb-log-files-in-group"), + MARIADB_REMOVED_OPTION("innodb-log-optimize-ddl"), + MARIADB_REMOVED_OPTION("innodb-page-cleaners"), + MARIADB_REMOVED_OPTION("innodb-replication-delay"), + MARIADB_REMOVED_OPTION("innodb-scrub-log"), + MARIADB_REMOVED_OPTION("innodb-scrub-log-speed"), + MARIADB_REMOVED_OPTION("innodb-thread-concurrency"), + MARIADB_REMOVED_OPTION("innodb-thread-sleep-delay"), + MARIADB_REMOVED_OPTION("innodb-undo-logs"), {0, 0, 0, 0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0} }; /* diff --git a/sql/upgrade_conf_file.cc b/sql/upgrade_conf_file.cc index a08fd087172..e2db046a372 100644 --- a/sql/upgrade_conf_file.cc +++ b/sql/upgrade_conf_file.cc @@ -42,13 +42,19 @@ static const char *removed_variables[] = "have_partitioning", "innodb_adaptive_flushing_method", "innodb_adaptive_hash_index_partitions", +"innodb_adaptive_max_sleep_delay", "innodb_additional_mem_pool_size", "innodb_api_bk_commit_interval", "innodb_api_disable_rowlock", "innodb_api_enable_binlog", "innodb_api_enable_mdl", "innodb_api_trx_level", +"innodb_background_scrub_data_check_interval", +"innodb_background_scrub_data_compressed", +"innodb_background_scrub_data_interval", +"innodb_background_scrub_data_uncompressed", "innodb_blocking_buffer_pool_restore", +"innodb_buffer_pool_instances", "innodb_buffer_pool_populate", "innodb_buffer_pool_restore_at_startup", "innodb_buffer_pool_shm_checksum", @@ -62,6 +68,8 @@ static const char *removed_variables[] = "innodb_cleaner_lsn_age_factor", "innodb_cleaner_max_flush_time", "innodb_cleaner_max_lru_time", +"innodb_commit_concurrency", +"innodb_concurrency_tickets", "innodb_corrupt_table_action", "innodb_dict_size_limit", "innodb_doublewrite_file", @@ -88,12 +96,16 @@ static const char *removed_variables[] = "innodb_log_archive", "innodb_log_block_size", "innodb_log_checksum_algorithm", -"innodb_rollback_segments", +"innodb_log_checksums", +"innodb_log_compressed_pages", +"innodb_log_files_in_group", +"innodb_log_optimize_ddl", "innodb_max_bitmap_file_size", "innodb_max_changed_pages", "innodb_merge_sort_block_size", "innodb_mirrored_log_groups", "innodb_mtflush_threads", +"innodb_page_cleaners", "innodb_persistent_stats_root_page", "innodb_print_lock_wait_timeout_info", "innodb_purge_run_now", @@ -101,15 +113,22 @@ static const char *removed_variables[] = "innodb_read_ahead", "innodb_recovery_stats", "innodb_recovery_update_relay_log", +"innodb_replication_delay", +"innodb_rollback_segments", +"innodb_scrub_log", +"innodb_scrub_log_speed", "innodb_show_locks_held", "innodb_show_verbose_locks", "innodb_stats_auto_update", "innodb_stats_sample_pages", "innodb_stats_update_need_lock", "innodb_support_xa", +"innodb_thread_concurrency", "innodb_thread_concurrency_timer_based", +"innodb_thread_sleep_delay", "innodb_track_changed_pages", "innodb_track_redo_log_now", +"innodb_undo_logs", "innodb_use_fallocate", "innodb_use_global_flush_log_at_trx_commit", "innodb_use_mtflush", diff --git a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc index cf51b91af64..14e551f15fa 100644 --- a/storage/innobase/handler/ha_innodb.cc +++ b/storage/innobase/handler/ha_innodb.cc @@ -3193,136 +3193,6 @@ static void innodb_buffer_pool_size_init() innobase_buffer_pool_size = srv_buf_pool_size; } -namespace deprecated { -/** Deprecated; no effect other than issuing a deprecation warning. */ -char* innodb_file_format; -/** Deprecated; no effect other than issuing a deprecation warning. */ -char* innodb_large_prefix; - -/** Deprecated parameter with no effect */ -static my_bool innodb_log_checksums; -/** Deprecation message for innodb_log_checksums */ -static const char* innodb_log_checksums_msg -= "The parameter innodb_log_checksums is deprecated and has no effect."; -/** Deprecated parameter with no effect */ -static my_bool innodb_log_compressed_pages; -/** Deprecation message for innodb_log_compressed_pages */ -static const char* innodb_log_compressed_pages_msg -= "The parameter innodb_log_compressed_pages is deprecated and has no effect."; -/** Deprecated parameter with no effect */ -static my_bool innodb_log_optimize_ddl; -static const char* innodb_log_optimize_ddl_msg -= "The parameter innodb_log_optimize_ddl is deprecated and has no effect."; -/** Deprecated parameter with no effect */ -static my_bool innodb_scrub_log; -/** Deprecation message for innodb_scrub_log */ -static const char* innodb_scrub_log_msg -= "The parameter innodb_scrub_log is deprecated and has no effect."; -/** Deprecated parameter with no effect */ -static ulonglong innodb_scrub_log_speed; -/** Deprecation message for innodb_scrub_log_speed */ -static const char* innodb_scrub_log_speed_msg -= "The parameter innodb_scrub_log_speed is deprecated and has no effect."; -/** Deprecated parameter with no effect */ -static ulong innodb_undo_logs; -/** Deprecation message for innodb_undo_logs */ -static const char* innodb_undo_logs_msg -= "The parameter innodb_undo_logs is deprecated and has no effect."; -/** Deprecated parameter with no effect */ -static ulong innodb_buffer_pool_instances; -/** Deprecated parameter with no effect */ -static ulong innodb_page_cleaners; -static const char* innodb_page_cleaners_msg -= "The parameter innodb_page_cleaners is deprecated and has no effect."; - -ulong srv_n_log_files; -static const char* srv_n_log_files_msg -= "The parameter innodb_log_files_in_group is deprecated and has no effect."; - -static my_bool innodb_background_scrub_data_uncompressed; - -static const char* innodb_background_scrub_data_uncompressed_msg -= "The parameter innodb_background_scrub_data_uncompressed is deprecated and" - " has no effect."; - -static my_bool innodb_background_scrub_data_compressed; - -static const char* innodb_background_scrub_data_compressed_msg -= "The parameter innodb_background_scrub_data_compressed is deprecated and" - " has no effect."; - -static uint innodb_background_scrub_data_check_interval; - -static const char* innodb_background_scrub_data_check_interval_msg -= "The parameter innodb_background_scrub_data_check_interval is deprecated and" - " has no effect."; - -static uint innodb_background_scrub_data_interval; - -static const char* innodb_background_scrub_data_interval_msg -= "The parameter innodb_background_scrub_data_interval is deprecated and" - " has no effect."; - -uint replication_delay; -uint thread_concurrency; -uint commit_concurrency; -uint concurrency_tickets; -uint adaptive_max_sleep_delay; -uint thread_sleep_delay; - -static const char * const replication_delay_msg -= "The parameter innodb_replication_delay is deprecated and has no effect."; -static const char * const thread_concurrency_msg -= "The parameter innodb_thread_concurrency is deprecated and has no effect."; -static const char * const commit_concurrency_msg -= "The parameter innodb_commit_concurrency is deprecated and has no effect."; -static const char * const concurrency_tickets_msg -= "The parameter innodb_concurrency_tickets is deprecated and has no effect."; -static const char * const adaptive_max_sleep_delay_msg -= "The parameter innodb_adaptive_max_sleep_delay is deprecated and" - " has no effect."; -static const char * const thread_sleep_delay_msg -= "The parameter innodb_thread_sleep_delay is deprecated and has no effect."; - -static void replication_delay_warn(THD* thd, st_mysql_sys_var*, void*, - const void*) -{ - push_warning_printf(thd, Sql_condition::WARN_LEVEL_WARN, HA_ERR_UNSUPPORTED, - replication_delay_msg); -} -static void thread_concurrency_warn(THD* thd, st_mysql_sys_var*, void*, - const void*) -{ - push_warning_printf(thd, Sql_condition::WARN_LEVEL_WARN, HA_ERR_UNSUPPORTED, - thread_concurrency_msg); -} -static void commit_concurrency_warn(THD* thd, st_mysql_sys_var*, void*, - const void*) -{ - push_warning_printf(thd, Sql_condition::WARN_LEVEL_WARN, HA_ERR_UNSUPPORTED, - commit_concurrency_msg); -} -static void concurrency_tickets_warn(THD* thd, st_mysql_sys_var*, void*, - const void*) -{ - push_warning_printf(thd, Sql_condition::WARN_LEVEL_WARN, HA_ERR_UNSUPPORTED, - concurrency_tickets_msg); -} -static void adaptive_max_sleep_delay_warn(THD* thd, st_mysql_sys_var*, void*, - const void*) -{ - push_warning_printf(thd, Sql_condition::WARN_LEVEL_WARN, HA_ERR_UNSUPPORTED, - adaptive_max_sleep_delay_msg); -} -static void thread_sleep_delay_warn(THD* thd, st_mysql_sys_var*, void*, - const void*) -{ - push_warning_printf(thd, Sql_condition::WARN_LEVEL_WARN, HA_ERR_UNSUPPORTED, - thread_sleep_delay_msg); -} - -} // namespace deprecated - /** Initialize, validate and normalize the InnoDB startup parameters. @return failure code @retval 0 on success @@ -3336,90 +3206,6 @@ static int innodb_init_params() char *default_path; ulong num_pll_degree; - if (deprecated::innodb_large_prefix || deprecated::innodb_file_format) { - const char* p = deprecated::innodb_file_format - ? "file_format" - : "large_prefix"; - sql_print_warning("The parameter innodb_%s is deprecated" - " and has no effect." - " It may be removed in future releases." - " See https://mariadb.com/kb/en/library/" - "xtradbinnodb-file-format/", p); - } - - if (UNIV_UNLIKELY(!deprecated::innodb_log_checksums)) { - sql_print_warning(deprecated::innodb_log_checksums_msg); - deprecated::innodb_log_checksums = TRUE; - } - - if (UNIV_UNLIKELY(!deprecated::innodb_log_compressed_pages)) { - sql_print_warning(deprecated::innodb_log_compressed_pages_msg); - deprecated::innodb_log_compressed_pages = TRUE; - } - - if (UNIV_UNLIKELY(deprecated::innodb_log_optimize_ddl)) { - sql_print_warning(deprecated::innodb_log_optimize_ddl_msg); - deprecated::innodb_log_optimize_ddl = FALSE; - } - - if (UNIV_UNLIKELY(deprecated::innodb_scrub_log)) { - sql_print_warning(deprecated::innodb_scrub_log_msg); - deprecated::innodb_scrub_log = FALSE; - } - - if (UNIV_UNLIKELY(deprecated::innodb_scrub_log_speed != 256)) { - sql_print_warning(deprecated::innodb_scrub_log_speed_msg); - deprecated::innodb_scrub_log_speed = 256; - } - - if (UNIV_UNLIKELY(deprecated::innodb_buffer_pool_instances)) { - sql_print_warning("The parameter innodb_buffer_pool_instances" - " is deprecated and has no effect."); - } - - if (UNIV_UNLIKELY(deprecated::innodb_page_cleaners)) { - sql_print_warning(deprecated::innodb_page_cleaners_msg); - } - - if (UNIV_UNLIKELY(deprecated::srv_n_log_files != 1)) { - sql_print_warning(deprecated::srv_n_log_files_msg); - deprecated::srv_n_log_files = 1; - } - - deprecated::innodb_buffer_pool_instances = 1; - - deprecated::innodb_page_cleaners = 1; - - if (UNIV_UNLIKELY(deprecated::innodb_undo_logs != TRX_SYS_N_RSEGS)) { - sql_print_warning(deprecated::innodb_undo_logs_msg); - deprecated::innodb_undo_logs = TRX_SYS_N_RSEGS; - } - - if (UNIV_UNLIKELY(deprecated::replication_delay)) { - sql_print_warning(deprecated::replication_delay_msg); - deprecated::replication_delay = 0; - } - if (UNIV_UNLIKELY(deprecated::thread_concurrency)) { - sql_print_warning(deprecated::thread_concurrency_msg); - deprecated::thread_concurrency = 0; - } - if (UNIV_UNLIKELY(deprecated::commit_concurrency)) { - sql_print_warning(deprecated::commit_concurrency_msg); - deprecated::commit_concurrency = 0; - } - if (UNIV_UNLIKELY(deprecated::concurrency_tickets)) { - sql_print_warning(deprecated::concurrency_tickets_msg); - deprecated::concurrency_tickets = 0; - } - if (UNIV_UNLIKELY(deprecated::adaptive_max_sleep_delay)) { - sql_print_warning(deprecated::adaptive_max_sleep_delay_msg); - deprecated::adaptive_max_sleep_delay = 0; - } - if (UNIV_UNLIKELY(deprecated::thread_sleep_delay)) { - sql_print_warning(deprecated::thread_sleep_delay_msg); - deprecated::thread_sleep_delay = 0; - } - /* Check that values don't overflow on 32-bit systems. */ if (sizeof(ulint) == 4) { if (innobase_buffer_pool_size > UINT_MAX32) { @@ -18620,107 +18406,6 @@ innodb_encrypt_tables_update(THD*, st_mysql_sys_var*, void*, const void* save) mysql_mutex_lock(&LOCK_global_system_variables); } -/** Issue a deprecation warning for SET GLOBAL innodb_log_checksums. -@param[in,out] thd client connection */ -static void -innodb_log_checksums_warn(THD* thd, st_mysql_sys_var*, void*, const void*) -{ - push_warning_printf(thd, Sql_condition::WARN_LEVEL_WARN, - HA_ERR_UNSUPPORTED, - deprecated::innodb_log_checksums_msg); -} - -/** Issue a deprecation warning for SET GLOBAL innodb_log_compressed_pages. -@param[in,out] thd client connection */ -static void -innodb_log_compressed_pages_warn(THD* thd, st_mysql_sys_var*, void*, - const void*) -{ - push_warning_printf(thd, Sql_condition::WARN_LEVEL_WARN, - HA_ERR_UNSUPPORTED, - deprecated::innodb_log_compressed_pages_msg); -} - -/** Issue a deprecation warning for SET GLOBAL innodb_log_optimize_ddl. -@param[in,out] thd client connection */ -static void -innodb_log_optimize_ddl_warn(THD* thd, st_mysql_sys_var*, void*, const void*) -{ - push_warning_printf(thd, Sql_condition::WARN_LEVEL_WARN, - HA_ERR_UNSUPPORTED, - deprecated::innodb_log_optimize_ddl_msg); -} - -/** Issue a deprecation warning for SET GLOBAL innodb_page_cleaners. -@param[in,out] thd client connection */ -static void -innodb_page_cleaners_warn(THD* thd, st_mysql_sys_var*, void*, const void*) -{ - push_warning_printf(thd, Sql_condition::WARN_LEVEL_WARN, - HA_ERR_UNSUPPORTED, - deprecated::innodb_page_cleaners_msg); -} - -/** Issue a deprecation warning for SET GLOBAL innodb_undo_logs. -@param[in,out] thd client connection */ -static void -innodb_undo_logs_warn(THD* thd, st_mysql_sys_var*, void*, const void*) -{ - push_warning_printf(thd, Sql_condition::WARN_LEVEL_WARN, - HA_ERR_UNSUPPORTED, - deprecated::innodb_undo_logs_msg); -} - -/** Issue a deprecation warning for SET GLOBAL innodb_scrub_log_speed. -@param[in,out] thd client connection */ -static void -innodb_scrub_log_speed_warn(THD* thd, st_mysql_sys_var*, void*, const void*) -{ - push_warning_printf(thd, Sql_condition::WARN_LEVEL_WARN, - HA_ERR_UNSUPPORTED, - deprecated::innodb_scrub_log_speed_msg); -} - -static void -innodb_background_scrub_data_uncompressed_warn(THD* thd, st_mysql_sys_var*, - void*, const void*) -{ - push_warning_printf( - thd, Sql_condition::WARN_LEVEL_WARN, - HA_ERR_UNSUPPORTED, - deprecated::innodb_background_scrub_data_uncompressed_msg); -} - -static void -innodb_background_scrub_data_compressed_warn(THD* thd, st_mysql_sys_var*, - void*, const void*) -{ - push_warning_printf( - thd, Sql_condition::WARN_LEVEL_WARN, - HA_ERR_UNSUPPORTED, - deprecated::innodb_background_scrub_data_compressed_msg); -} - -static void -innodb_background_scrub_data_check_interval_warn( - THD* thd, st_mysql_sys_var*, void*, const void*) -{ - push_warning_printf( - thd, Sql_condition::WARN_LEVEL_WARN, - HA_ERR_UNSUPPORTED, - deprecated::innodb_background_scrub_data_check_interval_msg); -} - -static void -innodb_background_scrub_data_interval_warn( - THD* thd, st_mysql_sys_var*, void*, const void*) -{ - push_warning_printf( - thd, Sql_condition::WARN_LEVEL_WARN, - HA_ERR_UNSUPPORTED, - deprecated::innodb_background_scrub_data_interval_msg); -} - static SHOW_VAR innodb_status_variables_export[]= { {"Innodb", (char*) &show_innodb_vars, SHOW_FUNC}, {NullS, NullS, SHOW_LONG} @@ -18949,7 +18634,7 @@ static MYSQL_SYSVAR_ENUM(checksum_algorithm, srv_checksum_algorithm, " to match when reading;" " NONE" " write a constant magic number, do not do any checksum verification" - " when reading (same as innodb_checksums=OFF);" + " when reading;" " STRICT_NONE" " write a constant magic number, do not allow values other than that" " magic number when reading;" @@ -18959,14 +18644,6 @@ static MYSQL_SYSVAR_ENUM(checksum_algorithm, srv_checksum_algorithm, NULL, NULL, SRV_CHECKSUM_ALGORITHM_FULL_CRC32, &innodb_checksum_algorithm_typelib); -/** Description of deprecated and ignored parameters */ -static const char* innodb_deprecated_ignored -= "Deprecated parameter with no effect."; - -static MYSQL_SYSVAR_BOOL(log_checksums, deprecated::innodb_log_checksums, - PLUGIN_VAR_RQCMDARG, - innodb_deprecated_ignored, NULL, innodb_log_checksums_warn, TRUE); - static MYSQL_SYSVAR_STR(data_home_dir, innobase_data_home_dir, PLUGIN_VAR_READONLY, "The common part for InnoDB table spaces.", @@ -19109,13 +18786,6 @@ static MYSQL_SYSVAR_ENUM(flush_method, innodb_flush_method, NULL, NULL, IF_WIN(SRV_ALL_O_DIRECT_FSYNC, SRV_FSYNC), &innodb_flush_method_typelib); -static MYSQL_SYSVAR_STR(file_format, deprecated::innodb_file_format, - PLUGIN_VAR_RQCMDARG | PLUGIN_VAR_READONLY, - innodb_deprecated_ignored, NULL, NULL, NULL); -static MYSQL_SYSVAR_STR(large_prefix, deprecated::innodb_large_prefix, - PLUGIN_VAR_RQCMDARG | PLUGIN_VAR_READONLY, - innodb_deprecated_ignored, NULL, NULL, NULL); - static MYSQL_SYSVAR_BOOL(force_load_corrupted, srv_load_corrupted, PLUGIN_VAR_NOCMDARG | PLUGIN_VAR_READONLY, "Force InnoDB to load metadata of corrupted table.", @@ -19125,10 +18795,6 @@ static MYSQL_SYSVAR_STR(log_group_home_dir, srv_log_group_home_dir, PLUGIN_VAR_RQCMDARG | PLUGIN_VAR_READONLY, "Path to InnoDB log files.", NULL, NULL, NULL); -static MYSQL_SYSVAR_ULONG(page_cleaners, deprecated::innodb_page_cleaners, - PLUGIN_VAR_RQCMDARG, - innodb_deprecated_ignored, NULL, innodb_page_cleaners_warn, 0, 0, 64, 0); - static MYSQL_SYSVAR_DOUBLE(max_dirty_pages_pct, srv_max_buf_pool_modified_pct, PLUGIN_VAR_RQCMDARG, "Percentage of dirty pages allowed in bufferpool.", @@ -19244,26 +18910,12 @@ static MYSQL_SYSVAR_ULONG(adaptive_hash_index_parts, btr_ahi_parts, NULL, NULL, 8, 1, 512, 0); #endif /* BTR_CUR_HASH_ADAPT */ -static MYSQL_SYSVAR_UINT(replication_delay, deprecated::replication_delay, - PLUGIN_VAR_RQCMDARG, - innodb_deprecated_ignored, nullptr, deprecated::replication_delay_warn, - 0, 0, ~0U, 0); - static MYSQL_SYSVAR_UINT(compression_level, page_zip_level, PLUGIN_VAR_RQCMDARG, "Compression level used for zlib compression. 0 is no compression" ", 1 is fastest, 9 is best compression and default is 6.", NULL, NULL, DEFAULT_COMPRESSION_LEVEL, 0, 9, 0); -static MYSQL_SYSVAR_BOOL(log_compressed_pages, - deprecated::innodb_log_compressed_pages, - PLUGIN_VAR_OPCMDARG, - innodb_deprecated_ignored, NULL, innodb_log_compressed_pages_warn, TRUE); - -static MYSQL_SYSVAR_BOOL(log_optimize_ddl, deprecated::innodb_log_optimize_ddl, - PLUGIN_VAR_OPCMDARG, - innodb_deprecated_ignored, NULL, innodb_log_optimize_ddl_warn, FALSE); - static MYSQL_SYSVAR_ULONG(autoextend_increment, sys_tablespace_auto_extend_increment, PLUGIN_VAR_RQCMDARG, @@ -19322,11 +18974,6 @@ static MYSQL_SYSVAR_ENUM(lock_schedule_algorithm, innodb_lock_schedule_algorithm NULL, NULL, INNODB_LOCK_SCHEDULE_ALGORITHM_FCFS, &innodb_lock_schedule_algorithm_typelib); -static MYSQL_SYSVAR_ULONG(buffer_pool_instances, - deprecated::innodb_buffer_pool_instances, - PLUGIN_VAR_RQCMDARG | PLUGIN_VAR_READONLY, - innodb_deprecated_ignored, NULL, NULL, 0, 0, 64, 0); - static MYSQL_SYSVAR_STR(buffer_pool_filename, srv_buf_dump_filename, PLUGIN_VAR_RQCMDARG | PLUGIN_VAR_MEMALLOC, "Filename to/from which to dump/load the InnoDB buffer pool", @@ -19443,16 +19090,6 @@ static MYSQL_SYSVAR_ULONG(flush_neighbors, srv_flush_neighbors, " when flushing a block", NULL, NULL, 1, 0, 2, 0); -static MYSQL_SYSVAR_UINT(commit_concurrency, deprecated::commit_concurrency, - PLUGIN_VAR_RQCMDARG, - innodb_deprecated_ignored, nullptr, deprecated::commit_concurrency_warn, - 0, 0, 1000, 0); - -static MYSQL_SYSVAR_UINT(concurrency_tickets, deprecated::concurrency_tickets, - PLUGIN_VAR_RQCMDARG, - innodb_deprecated_ignored, nullptr, deprecated::concurrency_tickets_warn, - 0, 0, ~0U, 0); - static MYSQL_SYSVAR_BOOL(deadlock_detect, innobase_deadlock_detect, PLUGIN_VAR_NOCMDARG, "Enable/disable InnoDB deadlock detector (default ON)." @@ -19562,10 +19199,6 @@ static MYSQL_SYSVAR_ULONGLONG(log_file_size, srv_log_file_size, NULL, NULL, 96 << 20, 1 << 20, std::numeric_limits<ulonglong>::max(), UNIV_PAGE_SIZE_MAX); -static MYSQL_SYSVAR_ULONG(log_files_in_group, deprecated::srv_n_log_files, - PLUGIN_VAR_RQCMDARG | PLUGIN_VAR_READONLY, - innodb_deprecated_ignored, NULL, NULL, 1, 1, 100, 0); - static MYSQL_SYSVAR_ULONG(log_write_ahead_size, srv_log_write_ahead_size, PLUGIN_VAR_RQCMDARG, "Redo log write ahead unit size to avoid read-on-write," @@ -19600,28 +19233,12 @@ static MYSQL_SYSVAR_UINT(spin_wait_delay, srv_spin_wait_delay, "Maximum delay between polling for a spin lock (4 by default)", NULL, NULL, 4, 0, 6000, 0); -static MYSQL_SYSVAR_UINT(thread_concurrency, deprecated::thread_concurrency, - PLUGIN_VAR_RQCMDARG, - innodb_deprecated_ignored, nullptr, deprecated::thread_concurrency_warn, - 0, 0, 1000, 0); - -static MYSQL_SYSVAR_UINT( - adaptive_max_sleep_delay, deprecated::adaptive_max_sleep_delay, - PLUGIN_VAR_RQCMDARG, - innodb_deprecated_ignored, - nullptr, deprecated::adaptive_max_sleep_delay_warn, 0, 0, 1000000, 0); - static MYSQL_SYSVAR_BOOL(prefix_index_cluster_optimization, srv_prefix_index_cluster_optimization, PLUGIN_VAR_OPCMDARG, "Enable prefix optimization to sometimes avoid cluster index lookups.", NULL, NULL, FALSE); -static MYSQL_SYSVAR_UINT(thread_sleep_delay, deprecated::thread_sleep_delay, - PLUGIN_VAR_RQCMDARG, - innodb_deprecated_ignored, nullptr, deprecated::thread_sleep_delay_warn, - 0, 0, 1000000, 0); - static MYSQL_SYSVAR_STR(data_file_path, innobase_data_file_path, PLUGIN_VAR_RQCMDARG | PLUGIN_VAR_READONLY, "Path to individual files and their sizes.", @@ -19645,11 +19262,6 @@ static MYSQL_SYSVAR_ULONG(undo_tablespaces, srv_undo_tablespaces, 0L, /* Minimum value */ TRX_SYS_MAX_UNDO_SPACES, 0); /* Maximum value */ -static MYSQL_SYSVAR_ULONG(undo_logs, deprecated::innodb_undo_logs, - PLUGIN_VAR_OPCMDARG, - innodb_deprecated_ignored, NULL, innodb_undo_logs_warn, - TRX_SYS_N_RSEGS, 0, TRX_SYS_N_RSEGS, 0); - static MYSQL_SYSVAR_ULONGLONG(max_undo_log_size, srv_max_undo_log_size, PLUGIN_VAR_OPCMDARG, "Desired maximum UNDO tablespace size in bytes", @@ -19992,16 +19604,6 @@ static MYSQL_SYSVAR_UINT(encryption_rotation_iops, srv_n_fil_crypt_iops, innodb_encryption_rotation_iops_update, srv_n_fil_crypt_iops, 0, UINT_MAX32, 0); -static MYSQL_SYSVAR_BOOL(scrub_log, deprecated::innodb_scrub_log, - PLUGIN_VAR_OPCMDARG | PLUGIN_VAR_READONLY, - innodb_deprecated_ignored, - 0, 0, 0); - -static MYSQL_SYSVAR_ULONGLONG(scrub_log_speed, deprecated::innodb_scrub_log_speed, - PLUGIN_VAR_OPCMDARG, - innodb_deprecated_ignored, NULL, innodb_scrub_log_speed_warn, - 256, 1, 50000, 0); - static MYSQL_SYSVAR_BOOL(encrypt_log, srv_encrypt_log, PLUGIN_VAR_OPCMDARG | PLUGIN_VAR_READONLY, "Enable redo log encryption", @@ -20013,26 +19615,6 @@ static MYSQL_SYSVAR_BOOL(immediate_scrub_data_uncompressed, "Enable scrubbing of data", NULL, NULL, FALSE); -static MYSQL_SYSVAR_BOOL(background_scrub_data_uncompressed, - deprecated::innodb_background_scrub_data_uncompressed, - PLUGIN_VAR_OPCMDARG, innodb_deprecated_ignored, NULL, - innodb_background_scrub_data_uncompressed_warn, FALSE); - -static MYSQL_SYSVAR_BOOL(background_scrub_data_compressed, - deprecated::innodb_background_scrub_data_compressed, - PLUGIN_VAR_OPCMDARG, innodb_deprecated_ignored, NULL, - innodb_background_scrub_data_compressed_warn, FALSE); - -static MYSQL_SYSVAR_UINT(background_scrub_data_check_interval, - deprecated::innodb_background_scrub_data_check_interval, - 0, innodb_deprecated_ignored, NULL, - innodb_background_scrub_data_check_interval_warn, 0, 0, 0, 0); - -static MYSQL_SYSVAR_UINT(background_scrub_data_interval, - deprecated::innodb_background_scrub_data_interval, - 0, innodb_deprecated_ignored, NULL, - innodb_background_scrub_data_interval_warn, 0, 0, 0, 0); - static MYSQL_SYSVAR_BOOL(encrypt_temporary_tables, innodb_encrypt_temporary_tables, PLUGIN_VAR_OPCMDARG | PLUGIN_VAR_READONLY, "Enrypt the temporary table data.", @@ -20042,7 +19624,6 @@ static struct st_mysql_sys_var* innobase_system_variables[]= { MYSQL_SYSVAR(autoextend_increment), MYSQL_SYSVAR(buffer_pool_size), MYSQL_SYSVAR(buffer_pool_chunk_size), - MYSQL_SYSVAR(buffer_pool_instances), MYSQL_SYSVAR(buffer_pool_filename), MYSQL_SYSVAR(buffer_pool_dump_now), MYSQL_SYSVAR(buffer_pool_dump_at_shutdown), @@ -20065,9 +19646,6 @@ static struct st_mysql_sys_var* innobase_system_variables[]= { MYSQL_SYSVAR(lru_scan_depth), MYSQL_SYSVAR(flush_neighbors), MYSQL_SYSVAR(checksum_algorithm), - MYSQL_SYSVAR(log_checksums), - MYSQL_SYSVAR(commit_concurrency), - MYSQL_SYSVAR(concurrency_tickets), MYSQL_SYSVAR(compression_level), MYSQL_SYSVAR(data_file_path), MYSQL_SYSVAR(temp_data_file_path), @@ -20079,7 +19657,6 @@ static struct st_mysql_sys_var* innobase_system_variables[]= { MYSQL_SYSVAR(read_io_threads), MYSQL_SYSVAR(write_io_threads), MYSQL_SYSVAR(file_per_table), - MYSQL_SYSVAR(file_format), /* deprecated in MariaDB 10.2; no effect */ MYSQL_SYSVAR(flush_log_at_timeout), MYSQL_SYSVAR(flush_log_at_trx_commit), MYSQL_SYSVAR(flush_method), @@ -20093,7 +19670,6 @@ static struct st_mysql_sys_var* innobase_system_variables[]= { MYSQL_SYSVAR(ft_min_token_size), MYSQL_SYSVAR(ft_num_word_optimize), MYSQL_SYSVAR(ft_sort_pll_degree), - MYSQL_SYSVAR(large_prefix), /* deprecated in MariaDB 10.2; no effect */ MYSQL_SYSVAR(force_load_corrupted), MYSQL_SYSVAR(lock_schedule_algorithm), MYSQL_SYSVAR(lock_wait_timeout), @@ -20101,11 +19677,8 @@ static struct st_mysql_sys_var* innobase_system_variables[]= { MYSQL_SYSVAR(page_size), MYSQL_SYSVAR(log_buffer_size), MYSQL_SYSVAR(log_file_size), - MYSQL_SYSVAR(log_files_in_group), MYSQL_SYSVAR(log_write_ahead_size), MYSQL_SYSVAR(log_group_home_dir), - MYSQL_SYSVAR(log_compressed_pages), - MYSQL_SYSVAR(log_optimize_ddl), MYSQL_SYSVAR(max_dirty_pages_pct), MYSQL_SYSVAR(max_dirty_pages_pct_lwm), MYSQL_SYSVAR(adaptive_flushing_lwm), @@ -20136,7 +19709,6 @@ static struct st_mysql_sys_var* innobase_system_variables[]= { MYSQL_SYSVAR(adaptive_hash_index_parts), #endif /* BTR_CUR_HASH_ADAPT */ MYSQL_SYSVAR(stats_method), - MYSQL_SYSVAR(replication_delay), MYSQL_SYSVAR(status_file), MYSQL_SYSVAR(strict_mode), MYSQL_SYSVAR(sort_buffer_size), @@ -20144,10 +19716,7 @@ static struct st_mysql_sys_var* innobase_system_variables[]= { MYSQL_SYSVAR(sync_spin_loops), MYSQL_SYSVAR(spin_wait_delay), MYSQL_SYSVAR(table_locks), - MYSQL_SYSVAR(thread_concurrency), - MYSQL_SYSVAR(adaptive_max_sleep_delay), MYSQL_SYSVAR(prefix_index_cluster_optimization), - MYSQL_SYSVAR(thread_sleep_delay), MYSQL_SYSVAR(tmpdir), MYSQL_SYSVAR(autoinc_lock_mode), MYSQL_SYSVAR(version), @@ -20170,7 +19739,6 @@ static struct st_mysql_sys_var* innobase_system_variables[]= { MYSQL_SYSVAR(instant_alter_column_allowed), MYSQL_SYSVAR(io_capacity), MYSQL_SYSVAR(io_capacity_max), - MYSQL_SYSVAR(page_cleaners), MYSQL_SYSVAR(idle_flush_pct), MYSQL_SYSVAR(monitor_enable), MYSQL_SYSVAR(monitor_disable), @@ -20191,7 +19759,6 @@ static struct st_mysql_sys_var* innobase_system_variables[]= { MYSQL_SYSVAR(status_output_locks), MYSQL_SYSVAR(print_all_deadlocks), MYSQL_SYSVAR(cmp_per_index_enabled), - MYSQL_SYSVAR(undo_logs), MYSQL_SYSVAR(max_undo_log_size), MYSQL_SYSVAR(purge_rseg_truncate_frequency), MYSQL_SYSVAR(undo_log_truncate), @@ -20226,16 +19793,9 @@ static struct st_mysql_sys_var* innobase_system_variables[]= { MYSQL_SYSVAR(encryption_threads), MYSQL_SYSVAR(encryption_rotate_key_age), MYSQL_SYSVAR(encryption_rotation_iops), - MYSQL_SYSVAR(scrub_log), - MYSQL_SYSVAR(scrub_log_speed), MYSQL_SYSVAR(encrypt_log), MYSQL_SYSVAR(default_encryption_key_id), - /* Scrubing feature */ MYSQL_SYSVAR(immediate_scrub_data_uncompressed), - MYSQL_SYSVAR(background_scrub_data_uncompressed), - MYSQL_SYSVAR(background_scrub_data_compressed), - MYSQL_SYSVAR(background_scrub_data_interval), - MYSQL_SYSVAR(background_scrub_data_check_interval), MYSQL_SYSVAR(buf_dump_status_frequency), MYSQL_SYSVAR(background_thread), MYSQL_SYSVAR(encrypt_temporary_tables), @@ -20299,11 +19859,6 @@ static void innodb_params_adjust() { - /* The default value and the max value of - innodb_undo_logs must be equal to the available undo logs. */ - MYSQL_SYSVAR_NAME(undo_logs).max_val - = MYSQL_SYSVAR_NAME(undo_logs).def_val - = srv_available_undo_logs; MYSQL_SYSVAR_NAME(max_undo_log_size).max_val = 1ULL << (32U + srv_page_size_shift); MYSQL_SYSVAR_NAME(max_undo_log_size).min_val diff --git a/storage/innobase/log/log0log.cc b/storage/innobase/log/log0log.cc index 62de68790ed..1cf8d5fb5ad 100644 --- a/storage/innobase/log/log0log.cc +++ b/storage/innobase/log/log0log.cc @@ -451,9 +451,7 @@ log_set_capacity(ulonglong file_size) free = LOG_CHECKPOINT_FREE_PER_THREAD * 10 + LOG_CHECKPOINT_EXTRA_FREE; if (free >= smallest_capacity / 2) { - ib::error() << "Cannot continue operation because log file is " - "too small. Increase innodb_log_file_size " - "or decrease innodb_thread_concurrency. " + ib::error() << "innodb_log_file_size is too small. " << INNODB_PARAMETERS_MSG; return false; } |