diff options
author | Sergei Golubchik <sergii@pisem.net> | 2013-12-22 17:06:50 +0100 |
---|---|---|
committer | Sergei Golubchik <sergii@pisem.net> | 2013-12-22 17:06:50 +0100 |
commit | ffa8c4cfcc41d4f160e3bdfca5cfd4b01a7d6e63 (patch) | |
tree | 728585c36f22a5db3cea796430883d0ebc5c05eb /mysql-test/suite/sys_vars/r | |
parent | e27c34f9e4ca15c797fcd3191ee5679c2f237a09 (diff) | |
parent | 52c26f7a1f675185d2ef1a28aca7f9bcc67c6414 (diff) | |
download | mariadb-git-ffa8c4cfcc41d4f160e3bdfca5cfd4b01a7d6e63.tar.gz |
Percona-Server-5.6.14-rel62.0 merge
support ha_innodb.so as a dynamic plugin.
* remove obsolete *,innodb_plugin.rdiff files
* s/--plugin-load=/--plugin-load-add=/
* MYSQL_PLUGIN_IMPORT glob_hostname[]
* use my_error instead of push_warning_printf(ER_DEFAULT)
* don't use tdc_size and tc_size in a module
update test cases (XtraDB is 5.6.14, InnoDB is 5.6.10)
* copy new tests over
* disable some tests for (old) InnoDB
* delete XtraDB tests that no longer apply
small compatibility changes:
* s/HTON_EXTENDED_KEYS/HTON_SUPPORTS_EXTENDED_KEYS/
* revert unnecessary InnoDB changes to make it a bit closer to the upstream
fix XtraDB to compile on Windows (both as a static and a dynamic plugin)
disable XtraDB on Windows (deadlocks) and where no atomic ops are available (e.g. CentOS 5)
storage/innobase/handler/ha_innodb.cc:
revert few unnecessary changes to make it a bit closer to the original InnoDB
storage/innobase/include/univ.i:
correct the version to match what it was merged from
Diffstat (limited to 'mysql-test/suite/sys_vars/r')
31 files changed, 784 insertions, 105 deletions
diff --git a/mysql-test/suite/sys_vars/r/innodb_cleaner_eviction_factor_basic.result b/mysql-test/suite/sys_vars/r/innodb_cleaner_eviction_factor_basic.result new file mode 100644 index 00000000000..8f017ea40ec --- /dev/null +++ b/mysql-test/suite/sys_vars/r/innodb_cleaner_eviction_factor_basic.result @@ -0,0 +1,31 @@ +SET @start_value = @@GLOBAL.innodb_cleaner_eviction_factor; +SELECT @@GLOBAL.innodb_cleaner_eviction_factor; +@@GLOBAL.innodb_cleaner_eviction_factor +0 +SELECT @@SESSION.innodb_cleaner_eviction_factor; +ERROR HY000: Variable 'innodb_cleaner_eviction_factor' is a GLOBAL variable +SET GLOBAL innodb_cleaner_eviction_factor='OFF'; +SELECT @@GLOBAL.innodb_cleaner_eviction_factor; +@@GLOBAL.innodb_cleaner_eviction_factor +0 +SET GLOBAL innodb_cleaner_eviction_factor='ON'; +SELECT @@GLOBAL.innodb_cleaner_eviction_factor; +@@GLOBAL.innodb_cleaner_eviction_factor +1 +SET GLOBAL innodb_cleaner_eviction_factor=0; +SELECT @@GLOBAL.innodb_cleaner_eviction_factor; +@@GLOBAL.innodb_cleaner_eviction_factor +0 +SET GLOBAL innodb_cleaner_eviction_factor=1; +SELECT @@GLOBAL.innodb_cleaner_eviction_factor; +@@GLOBAL.innodb_cleaner_eviction_factor +1 +SET GLOBAL innodb_cleaner_eviction_factor=1.1; +ERROR 42000: Incorrect argument type to variable 'innodb_cleaner_eviction_factor' +SET GLOBAL innodb_cleaner_eviction_factor=1e1; +ERROR 42000: Incorrect argument type to variable 'innodb_cleaner_eviction_factor' +SET GLOBAL innodb_cleaner_eviction_factor=2; +ERROR 42000: Variable 'innodb_cleaner_eviction_factor' can't be set to the value of '2' +SET GLOBAL innodb_cleaner_eviction_factor='foo'; +ERROR 42000: Variable 'innodb_cleaner_eviction_factor' can't be set to the value of 'foo' +SET GLOBAL innodb_cleaner_eviction_factor = @start_value; diff --git a/mysql-test/suite/sys_vars/r/innodb_cleaner_flush_chunk_size_basic.result b/mysql-test/suite/sys_vars/r/innodb_cleaner_flush_chunk_size_basic.result new file mode 100644 index 00000000000..651023d7a38 --- /dev/null +++ b/mysql-test/suite/sys_vars/r/innodb_cleaner_flush_chunk_size_basic.result @@ -0,0 +1,31 @@ +SET @start_value = @@GLOBAL.innodb_cleaner_flush_chunk_size; +SELECT @@GLOBAL.innodb_cleaner_flush_chunk_size; +@@GLOBAL.innodb_cleaner_flush_chunk_size +100 +SELECT @@SESSION.innodb_cleaner_flush_chunk_size; +ERROR HY000: Variable 'innodb_cleaner_flush_chunk_size' is a GLOBAL variable +SET GLOBAL innodb_cleaner_flush_chunk_size=1; +SELECT @@GLOBAL.innodb_cleaner_flush_chunk_size; +@@GLOBAL.innodb_cleaner_flush_chunk_size +1 +SET GLOBAL innodb_cleaner_flush_chunk_size=1000; +SELECT @@GLOBAL.innodb_cleaner_flush_chunk_size; +@@GLOBAL.innodb_cleaner_flush_chunk_size +1000 +SET GLOBAL innodb_cleaner_flush_chunk_size=4294967295; +SELECT @@GLOBAL.innodb_cleaner_flush_chunk_size; +@@GLOBAL.innodb_cleaner_flush_chunk_size +4294967295 +SET GLOBAL innodb_cleaner_flush_chunk_size=0; +Warnings: +Warning 1292 Truncated incorrect innodb_cleaner_flush_chunk_size value: '0' +SELECT @@GLOBAL.innodb_cleaner_flush_chunk_size; +@@GLOBAL.innodb_cleaner_flush_chunk_size +1 +SET GLOBAL innodb_cleaner_flush_chunk_size=1.1; +ERROR 42000: Incorrect argument type to variable 'innodb_cleaner_flush_chunk_size' +SET GLOBAL innodb_cleaner_flush_chunk_size=1e1; +ERROR 42000: Incorrect argument type to variable 'innodb_cleaner_flush_chunk_size' +SET GLOBAL innodb_cleaner_flush_chunk_size='foo'; +ERROR 42000: Incorrect argument type to variable 'innodb_cleaner_flush_chunk_size' +SET GLOBAL innodb_cleaner_flush_chunk_size = @start_value; diff --git a/mysql-test/suite/sys_vars/r/innodb_cleaner_free_list_lwm_basic.result b/mysql-test/suite/sys_vars/r/innodb_cleaner_free_list_lwm_basic.result new file mode 100644 index 00000000000..2d7883b7d83 --- /dev/null +++ b/mysql-test/suite/sys_vars/r/innodb_cleaner_free_list_lwm_basic.result @@ -0,0 +1,35 @@ +SET @start_value = @@GLOBAL.innodb_cleaner_free_list_lwm; +SELECT @@GLOBAL.innodb_cleaner_free_list_lwm; +@@GLOBAL.innodb_cleaner_free_list_lwm +10 +SELECT @@SESSION.innodb_cleaner_free_list_lwm; +ERROR HY000: Variable 'innodb_cleaner_free_list_lwm' is a GLOBAL variable +SET GLOBAL innodb_cleaner_free_list_lwm=0; +SELECT @@GLOBAL.innodb_cleaner_free_list_lwm; +@@GLOBAL.innodb_cleaner_free_list_lwm +0 +SET GLOBAL innodb_cleaner_free_list_lwm=1; +SELECT @@GLOBAL.innodb_cleaner_free_list_lwm; +@@GLOBAL.innodb_cleaner_free_list_lwm +1 +SET GLOBAL innodb_cleaner_free_list_lwm=99; +SELECT @@GLOBAL.innodb_cleaner_free_list_lwm; +@@GLOBAL.innodb_cleaner_free_list_lwm +99 +SET GLOBAL innodb_cleaner_free_list_lwm=100; +SELECT @@GLOBAL.innodb_cleaner_free_list_lwm; +@@GLOBAL.innodb_cleaner_free_list_lwm +100 +SET GLOBAL innodb_cleaner_free_list_lwm=101; +Warnings: +Warning 1292 Truncated incorrect innodb_cleaner_free_list_lwm value: '101' +SELECT @@innodb_cleaner_free_list_lwm; +@@innodb_cleaner_free_list_lwm +100 +SET GLOBAL innodb_cleaner_free_list_lwm=1.1; +ERROR 42000: Incorrect argument type to variable 'innodb_cleaner_free_list_lwm' +SET GLOBAL innodb_cleaner_free_list_lwm=1e1; +ERROR 42000: Incorrect argument type to variable 'innodb_cleaner_free_list_lwm' +SET GLOBAL innodb_cleaner_free_list_lwm='foo'; +ERROR 42000: Incorrect argument type to variable 'innodb_cleaner_free_list_lwm' +SET GLOBAL innodb_cleaner_free_list_lwm = @start_value; diff --git a/mysql-test/suite/sys_vars/r/innodb_cleaner_lru_chunk_size_basic.result b/mysql-test/suite/sys_vars/r/innodb_cleaner_lru_chunk_size_basic.result new file mode 100644 index 00000000000..5dfc6738e11 --- /dev/null +++ b/mysql-test/suite/sys_vars/r/innodb_cleaner_lru_chunk_size_basic.result @@ -0,0 +1,31 @@ +SET @start_value = @@GLOBAL.innodb_cleaner_lru_chunk_size; +SELECT @@GLOBAL.innodb_cleaner_lru_chunk_size; +@@GLOBAL.innodb_cleaner_lru_chunk_size +100 +SELECT @@SESSION.innodb_cleaner_lru_chunk_size; +ERROR HY000: Variable 'innodb_cleaner_lru_chunk_size' is a GLOBAL variable +SET GLOBAL innodb_cleaner_lru_chunk_size=1; +SELECT @@GLOBAL.innodb_cleaner_lru_chunk_size; +@@GLOBAL.innodb_cleaner_lru_chunk_size +1 +SET GLOBAL innodb_cleaner_lru_chunk_size=1000; +SELECT @@GLOBAL.innodb_cleaner_lru_chunk_size; +@@GLOBAL.innodb_cleaner_lru_chunk_size +1000 +SET GLOBAL innodb_cleaner_lru_chunk_size=4294967295; +SELECT @@GLOBAL.innodb_cleaner_lru_chunk_size; +@@GLOBAL.innodb_cleaner_lru_chunk_size +4294967295 +SET GLOBAL innodb_cleaner_lru_chunk_size=0; +Warnings: +Warning 1292 Truncated incorrect innodb_cleaner_lru_chunk_size value: '0' +SELECT @@GLOBAL.innodb_cleaner_lru_chunk_size; +@@GLOBAL.innodb_cleaner_lru_chunk_size +1 +SET GLOBAL innodb_cleaner_lru_chunk_size=1.1; +ERROR 42000: Incorrect argument type to variable 'innodb_cleaner_lru_chunk_size' +SET GLOBAL innodb_cleaner_lru_chunk_size=1e1; +ERROR 42000: Incorrect argument type to variable 'innodb_cleaner_lru_chunk_size' +SET GLOBAL innodb_cleaner_lru_chunk_size='foo'; +ERROR 42000: Incorrect argument type to variable 'innodb_cleaner_lru_chunk_size' +SET GLOBAL innodb_cleaner_lru_chunk_size = @start_value; diff --git a/mysql-test/suite/sys_vars/r/innodb_cleaner_lsn_age_factor_basic.result b/mysql-test/suite/sys_vars/r/innodb_cleaner_lsn_age_factor_basic.result new file mode 100644 index 00000000000..6dd1b6dc489 --- /dev/null +++ b/mysql-test/suite/sys_vars/r/innodb_cleaner_lsn_age_factor_basic.result @@ -0,0 +1,21 @@ +SET @start_value = @@GLOBAL.innodb_cleaner_lsn_age_factor; +SELECT @@GLOBAL.innodb_cleaner_lsn_age_factor; +@@GLOBAL.innodb_cleaner_lsn_age_factor +high_checkpoint +SELECT @@SESSION.innodb_cleaner_lsn_age_factor; +ERROR HY000: Variable 'innodb_cleaner_lsn_age_factor' is a GLOBAL variable +SET GLOBAL innodb_cleaner_lsn_age_factor='legacy'; +SELECT @@GLOBAL.innodb_cleaner_lsn_age_factor; +@@GLOBAL.innodb_cleaner_lsn_age_factor +legacy +SET GLOBAL innodb_cleaner_lsn_age_factor='high_checkpoint'; +SELECT @@GLOBAL.innodb_cleaner_lsn_age_factor; +@@GLOBAL.innodb_cleaner_lsn_age_factor +high_checkpoint +SET GLOBAL innodb_cleaner_lsn_age_factor=1.1; +ERROR 42000: Incorrect argument type to variable 'innodb_cleaner_lsn_age_factor' +SET GLOBAL innodb_cleaner_lsn_age_factor=1e1; +ERROR 42000: Incorrect argument type to variable 'innodb_cleaner_lsn_age_factor' +SET GLOBAL innodb_cleaner_lsn_age_factor='foo'; +ERROR 42000: Variable 'innodb_cleaner_lsn_age_factor' can't be set to the value of 'foo' +SET GLOBAL innodb_cleaner_lsn_age_factor = @start_value; diff --git a/mysql-test/suite/sys_vars/r/innodb_cleaner_max_flush_time_basic.result b/mysql-test/suite/sys_vars/r/innodb_cleaner_max_flush_time_basic.result new file mode 100644 index 00000000000..e4a3fa26e73 --- /dev/null +++ b/mysql-test/suite/sys_vars/r/innodb_cleaner_max_flush_time_basic.result @@ -0,0 +1,25 @@ +SET @start_value = @@GLOBAL.innodb_cleaner_max_flush_time; +SELECT @@GLOBAL.innodb_cleaner_max_flush_time; +@@GLOBAL.innodb_cleaner_max_flush_time +1000 +SELECT @@SESSION.innodb_cleaner_max_flush_time; +ERROR HY000: Variable 'innodb_cleaner_max_flush_time' is a GLOBAL variable +SET GLOBAL innodb_cleaner_max_flush_time=0; +SELECT @@GLOBAL.innodb_cleaner_max_flush_time; +@@GLOBAL.innodb_cleaner_max_flush_time +0 +SET GLOBAL innodb_cleaner_max_flush_time=1000; +SELECT @@GLOBAL.innodb_cleaner_max_flush_time; +@@GLOBAL.innodb_cleaner_max_flush_time +1000 +SET GLOBAL innodb_cleaner_max_flush_time=4294967295; +SELECT @@GLOBAL.innodb_cleaner_max_flush_time; +@@GLOBAL.innodb_cleaner_max_flush_time +4294967295 +SET GLOBAL innodb_cleaner_max_flush_time=1.1; +ERROR 42000: Incorrect argument type to variable 'innodb_cleaner_max_flush_time' +SET GLOBAL innodb_cleaner_max_flush_time=1e1; +ERROR 42000: Incorrect argument type to variable 'innodb_cleaner_max_flush_time' +SET GLOBAL innodb_cleaner_max_flush_time='foo'; +ERROR 42000: Incorrect argument type to variable 'innodb_cleaner_max_flush_time' +SET GLOBAL innodb_cleaner_max_flush_time = @start_value; diff --git a/mysql-test/suite/sys_vars/r/innodb_cleaner_max_lru_time_basic.result b/mysql-test/suite/sys_vars/r/innodb_cleaner_max_lru_time_basic.result new file mode 100644 index 00000000000..f7bacbbd62e --- /dev/null +++ b/mysql-test/suite/sys_vars/r/innodb_cleaner_max_lru_time_basic.result @@ -0,0 +1,25 @@ +SET @start_value = @@GLOBAL.innodb_cleaner_max_lru_time; +SELECT @@GLOBAL.innodb_cleaner_max_lru_time; +@@GLOBAL.innodb_cleaner_max_lru_time +1000 +SELECT @@SESSION.innodb_cleaner_max_lru_time; +ERROR HY000: Variable 'innodb_cleaner_max_lru_time' is a GLOBAL variable +SET GLOBAL innodb_cleaner_max_lru_time=0; +SELECT @@GLOBAL.innodb_cleaner_max_lru_time; +@@GLOBAL.innodb_cleaner_max_lru_time +0 +SET GLOBAL innodb_cleaner_max_lru_time=1000; +SELECT @@GLOBAL.innodb_cleaner_max_lru_time; +@@GLOBAL.innodb_cleaner_max_lru_time +1000 +SET GLOBAL innodb_cleaner_max_lru_time=4294967295; +SELECT @@GLOBAL.innodb_cleaner_max_lru_time; +@@GLOBAL.innodb_cleaner_max_lru_time +4294967295 +SET GLOBAL innodb_cleaner_max_lru_time=1.1; +ERROR 42000: Incorrect argument type to variable 'innodb_cleaner_max_lru_time' +SET GLOBAL innodb_cleaner_max_lru_time=1e1; +ERROR 42000: Incorrect argument type to variable 'innodb_cleaner_max_lru_time' +SET GLOBAL innodb_cleaner_max_lru_time='foo'; +ERROR 42000: Incorrect argument type to variable 'innodb_cleaner_max_lru_time' +SET GLOBAL innodb_cleaner_max_lru_time = @start_value; diff --git a/mysql-test/suite/sys_vars/r/innodb_empty_free_list_algorithm_basic.result b/mysql-test/suite/sys_vars/r/innodb_empty_free_list_algorithm_basic.result new file mode 100644 index 00000000000..f95553e3fa2 --- /dev/null +++ b/mysql-test/suite/sys_vars/r/innodb_empty_free_list_algorithm_basic.result @@ -0,0 +1,23 @@ +SET @start_value = @@GLOBAL.innodb_empty_free_list_algorithm; +SELECT @@GLOBAL.innodb_empty_free_list_algorithm; +@@GLOBAL.innodb_empty_free_list_algorithm +backoff +SELECT @@SESSION.innodb_empty_free_list_algorithm; +ERROR HY000: Variable 'innodb_empty_free_list_algorithm' is a GLOBAL variable +SET GLOBAL innodb_empty_free_list_algorithm='legacy'; +SELECT @@GLOBAL.innodb_empty_free_list_algorithm; +@@GLOBAL.innodb_empty_free_list_algorithm +legacy +SET GLOBAL innodb_empty_free_list_algorithm='backoff'; +SELECT @@GLOBAL.innodb_empty_free_list_algorithm; +@@GLOBAL.innodb_empty_free_list_algorithm +backoff +SET GLOBAL innodb_empty_free_list_algorithm=1.1; +ERROR 42000: Incorrect argument type to variable 'innodb_empty_free_list_algorithm' +SET GLOBAL innodb_empty_free_list_algorithm=1e1; +ERROR 42000: Incorrect argument type to variable 'innodb_empty_free_list_algorithm' +SET GLOBAL innodb_empty_free_list_algorithm=2; +ERROR 42000: Variable 'innodb_empty_free_list_algorithm' can't be set to the value of '2' +SET GLOBAL innodb_empty_free_list_algorithm='foo'; +ERROR 42000: Variable 'innodb_empty_free_list_algorithm' can't be set to the value of 'foo' +SET GLOBAL innodb_empty_free_list_algorithm = @start_value; diff --git a/mysql-test/suite/sys_vars/r/innodb_foreground_preflush_basic.result b/mysql-test/suite/sys_vars/r/innodb_foreground_preflush_basic.result new file mode 100644 index 00000000000..4ad0ce8d78e --- /dev/null +++ b/mysql-test/suite/sys_vars/r/innodb_foreground_preflush_basic.result @@ -0,0 +1,23 @@ +SET @start_value = @@GLOBAL.innodb_foreground_preflush; +SELECT @@GLOBAL.innodb_foreground_preflush; +@@GLOBAL.innodb_foreground_preflush +exponential_backoff +SELECT @@SESSION.innodb_foreground_preflush; +ERROR HY000: Variable 'innodb_foreground_preflush' is a GLOBAL variable +SET GLOBAL innodb_foreground_preflush='sync_preflush'; +SELECT @@GLOBAL.innodb_foreground_preflush; +@@GLOBAL.innodb_foreground_preflush +sync_preflush +SET GLOBAL innodb_foreground_preflush='exponential_backoff'; +SELECT @@GLOBAL.innodb_foreground_preflush; +@@GLOBAL.innodb_foreground_preflush +exponential_backoff +SET GLOBAL innodb_foreground_preflush=1.1; +ERROR 42000: Incorrect argument type to variable 'innodb_foreground_preflush' +SET GLOBAL innodb_foreground_preflush=1e1; +ERROR 42000: Incorrect argument type to variable 'innodb_foreground_preflush' +SET GLOBAL innodb_foreground_preflush=2; +ERROR 42000: Variable 'innodb_foreground_preflush' can't be set to the value of '2' +SET GLOBAL innodb_foreground_preflush='foo'; +ERROR 42000: Variable 'innodb_foreground_preflush' can't be set to the value of 'foo' +SET GLOBAL innodb_foreground_preflush = @start_value; diff --git a/mysql-test/suite/sys_vars/r/innodb_ft_result_cache_limit_basic.result b/mysql-test/suite/sys_vars/r/innodb_ft_result_cache_limit_basic.result new file mode 100644 index 00000000000..0aefabd48f7 --- /dev/null +++ b/mysql-test/suite/sys_vars/r/innodb_ft_result_cache_limit_basic.result @@ -0,0 +1,32 @@ +select @@global.innodb_ft_result_cache_limit; +@@global.innodb_ft_result_cache_limit +2000000000 +select @@session.innodb_ft_result_cache_limit; +ERROR HY000: Variable 'innodb_ft_result_cache_limit' is a GLOBAL variable +show global variables like 'innodb_ft_result_cache_limit'; +Variable_name Value +innodb_ft_result_cache_limit 2000000000 +show session variables like 'innodb_ft_result_cache_limit'; +Variable_name Value +innodb_ft_result_cache_limit 2000000000 +select * from information_schema.global_variables where variable_name='innodb_ft_result_cache_limit'; +VARIABLE_NAME VARIABLE_VALUE +INNODB_FT_RESULT_CACHE_LIMIT 2000000000 +select * from information_schema.session_variables where variable_name='innodb_ft_result_cache_limit'; +VARIABLE_NAME VARIABLE_VALUE +INNODB_FT_RESULT_CACHE_LIMIT 2000000000 +set global innodb_ft_result_cache_limit=900000; +Warnings: +Warning 1292 Truncated incorrect innodb_ft_result_cache_limit value: '900000' +select @@innodb_ft_result_cache_limit; +@@innodb_ft_result_cache_limit +1000000 +set global innodb_ft_result_cache_limit=1000000; +select @@innodb_ft_result_cache_limit; +@@innodb_ft_result_cache_limit +1000000 +set global innodb_ft_result_cache_limit=4000000000; +select @@innodb_ft_result_cache_limit; +@@innodb_ft_result_cache_limit +4000000000 +set global innodb_ft_result_cache_limit=2000000000; diff --git a/mysql-test/suite/sys_vars/r/innodb_ft_total_cache_size_basic.result b/mysql-test/suite/sys_vars/r/innodb_ft_total_cache_size_basic.result new file mode 100644 index 00000000000..ff234a1fcbf --- /dev/null +++ b/mysql-test/suite/sys_vars/r/innodb_ft_total_cache_size_basic.result @@ -0,0 +1,21 @@ +select @@global.innodb_ft_total_cache_size; +@@global.innodb_ft_total_cache_size +640000000 +select @@session.innodb_ft_total_cache_size; +ERROR HY000: Variable 'innodb_ft_total_cache_size' is a GLOBAL variable +show global variables like 'innodb_ft_total_cache_size'; +Variable_name Value +innodb_ft_total_cache_size 640000000 +show session variables like 'innodb_ft_total_cache_size'; +Variable_name Value +innodb_ft_total_cache_size 640000000 +select * from information_schema.global_variables where variable_name='innodb_ft_total_cache_size'; +VARIABLE_NAME VARIABLE_VALUE +INNODB_FT_TOTAL_CACHE_SIZE 640000000 +select * from information_schema.session_variables where variable_name='innodb_ft_total_cache_size'; +VARIABLE_NAME VARIABLE_VALUE +INNODB_FT_TOTAL_CACHE_SIZE 640000000 +set global innodb_ft_total_cache_size=1; +ERROR HY000: Variable 'innodb_ft_total_cache_size' is a read only variable +set session innodb_ft_total_cache_size=1; +ERROR HY000: Variable 'innodb_ft_total_cache_size' is a read only variable diff --git a/mysql-test/suite/sys_vars/r/innodb_log_arch_dir_basic.result b/mysql-test/suite/sys_vars/r/innodb_log_arch_dir_basic.result new file mode 100644 index 00000000000..bead0303520 --- /dev/null +++ b/mysql-test/suite/sys_vars/r/innodb_log_arch_dir_basic.result @@ -0,0 +1,38 @@ +SELECT @@GLOBAL.innodb_log_arch_dir; +@@GLOBAL.innodb_log_arch_dir +./ +NULL Expected +SET @@GLOBAL.innodb_log_arch_dir=1; +ERROR HY000: Variable 'innodb_log_arch_dir' is a read only variable +Expected error 'Read only variable' +SELECT @@GLOBAL.innodb_log_arch_dir; +@@GLOBAL.innodb_log_arch_dir +./ +NULL Expected +SELECT VARIABLE_VALUE +FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES +WHERE VARIABLE_NAME='innodb_log_arch_dir'; +VARIABLE_VALUE +./ +empty string Expected +SELECT @@innodb_log_arch_dir; +@@innodb_log_arch_dir +./ +NULL Expected +SELECT @@innodb_log_arch_dir; +@@innodb_log_arch_dir +./ +NULL Expected +SELECT @@local.innodb_log_arch_dir; +ERROR HY000: Variable 'innodb_log_arch_dir' is a GLOBAL variable +Expected error 'Variable is a GLOBAL variable' +SELECT @@SESSION.innodb_log_arch_dir; +ERROR HY000: Variable 'innodb_log_arch_dir' is a GLOBAL variable +Expected error 'Variable is a GLOBAL variable' +SELECT @@GLOBAL.innodb_log_arch_dir; +@@GLOBAL.innodb_log_arch_dir +./ +NULL Expected +SELECT innodb_log_arch_dir = @@SESSION.innodb_log_arch_dir; +ERROR 42S22: Unknown column 'innodb_log_arch_dir' in 'field list' +Expected error Unknown column 'innodb_log_arch_dir' in 'field list' diff --git a/mysql-test/suite/sys_vars/r/innodb_log_arch_expire_sec_basic.result b/mysql-test/suite/sys_vars/r/innodb_log_arch_expire_sec_basic.result new file mode 100644 index 00000000000..97bff097252 --- /dev/null +++ b/mysql-test/suite/sys_vars/r/innodb_log_arch_expire_sec_basic.result @@ -0,0 +1,38 @@ +SELECT @@GLOBAL.innodb_log_arch_expire_sec INTO @save; +SELECT @@GLOBAL.innodb_log_arch_expire_sec; +@@GLOBAL.innodb_log_arch_expire_sec +0 +0 Expected +SET @@GLOBAL.innodb_log_arch_expire_sec=1; +SELECT @@GLOBAL.innodb_log_arch_expire_sec; +@@GLOBAL.innodb_log_arch_expire_sec +1 +1 Expected +SELECT VARIABLE_VALUE +FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES +WHERE VARIABLE_NAME='innodb_log_arch_expire_sec'; +VARIABLE_VALUE +1 +1 Expected +SELECT @@innodb_log_arch_expire_sec; +@@innodb_log_arch_expire_sec +1 +1 Expected +SELECT @@innodb_log_arch_expire_sec; +@@innodb_log_arch_expire_sec +1 +1 Expected +SELECT @@local.innodb_log_arch_expire_sec; +ERROR HY000: Variable 'innodb_log_arch_expire_sec' is a GLOBAL variable +Expected error 'Variable is a GLOBAL variable' +SELECT @@SESSION.innodb_log_arch_expire_sec; +ERROR HY000: Variable 'innodb_log_arch_expire_sec' is a GLOBAL variable +Expected error 'Variable is a GLOBAL variable' +SELECT @@GLOBAL.innodb_log_arch_expire_sec; +@@GLOBAL.innodb_log_arch_expire_sec +1 +1 Expected +SELECT innodb_log_arch_expire_sec = @@SESSION.innodb_log_arch_expire_sec; +ERROR 42S22: Unknown column 'innodb_log_arch_expire_sec' in 'field list' +Expected error Unknown column 'innodb_log_arch_expire_sec' in 'field list' +SET @@GLOBAL.innodb_log_arch_expire_sec = @save; diff --git a/mysql-test/suite/sys_vars/r/innodb_log_archive_basic.result b/mysql-test/suite/sys_vars/r/innodb_log_archive_basic.result new file mode 100644 index 00000000000..bb9b53482fa --- /dev/null +++ b/mysql-test/suite/sys_vars/r/innodb_log_archive_basic.result @@ -0,0 +1,38 @@ +SELECT @@GLOBAL.innodb_log_archive; +@@GLOBAL.innodb_log_archive +0 +0 Expected +SET @save_innodb_log_archive = @@GLOBAL.innodb_log_archive; +SET @@GLOBAL.innodb_log_archive=1; +SELECT @@GLOBAL.innodb_log_archive; +@@GLOBAL.innodb_log_archive +1 +1 Expected +SELECT VARIABLE_VALUE +FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES +WHERE VARIABLE_NAME='innodb_log_archive'; +VARIABLE_VALUE +ON +ON Expected +SET @@GLOBAL.innodb_log_archive = @save_innodb_log_archive; +SELECT @@innodb_log_archive; +@@innodb_log_archive +0 +0 Expected +SELECT @@innodb_log_archive; +@@innodb_log_archive +0 +0 Expected +SELECT @@local.innodb_log_archive; +ERROR HY000: Variable 'innodb_log_archive' is a GLOBAL variable +Expected error 'Variable is a GLOBAL variable' +SELECT @@SESSION.innodb_log_archive; +ERROR HY000: Variable 'innodb_log_archive' is a GLOBAL variable +Expected error 'Variable is a GLOBAL variable' +SELECT @@GLOBAL.innodb_log_archive; +@@GLOBAL.innodb_log_archive +0 +0 Expected +SELECT innodb_log_archive = @@SESSION.innodb_log_archive; +ERROR 42S22: Unknown column 'innodb_log_archive' in 'field list' +Expected error Unknown column 'innodb_log_archive' in 'field list' diff --git a/mysql-test/suite/sys_vars/r/innodb_log_checksum_algorithm_basic.result b/mysql-test/suite/sys_vars/r/innodb_log_checksum_algorithm_basic.result new file mode 100644 index 00000000000..cb03046c84d --- /dev/null +++ b/mysql-test/suite/sys_vars/r/innodb_log_checksum_algorithm_basic.result @@ -0,0 +1,47 @@ +SET @orig = @@global.innodb_log_checksum_algorithm; +SELECT @orig; +@orig +innodb +SET GLOBAL innodb_log_checksum_algorithm = 'crc32'; +SELECT @@global.innodb_log_checksum_algorithm; +@@global.innodb_log_checksum_algorithm +crc32 +SET GLOBAL innodb_log_checksum_algorithm = 'strict_crc32'; +SELECT @@global.innodb_log_checksum_algorithm; +@@global.innodb_log_checksum_algorithm +strict_crc32 +SET GLOBAL innodb_log_checksum_algorithm = 'innodb'; +SELECT @@global.innodb_log_checksum_algorithm; +@@global.innodb_log_checksum_algorithm +innodb +SET GLOBAL innodb_log_checksum_algorithm = 'strict_innodb'; +SELECT @@global.innodb_log_checksum_algorithm; +@@global.innodb_log_checksum_algorithm +strict_innodb +SET GLOBAL innodb_log_checksum_algorithm = 'none'; +SELECT @@global.innodb_log_checksum_algorithm; +@@global.innodb_log_checksum_algorithm +none +SET GLOBAL innodb_log_checksum_algorithm = 'strict_none'; +SELECT @@global.innodb_log_checksum_algorithm; +@@global.innodb_log_checksum_algorithm +strict_none +SET GLOBAL innodb_log_checksum_algorithm = ''; +ERROR 42000: Variable 'innodb_log_checksum_algorithm' can't be set to the value of '' +SELECT @@global.innodb_log_checksum_algorithm; +@@global.innodb_log_checksum_algorithm +strict_none +SET GLOBAL innodb_log_checksum_algorithm = 'foobar'; +ERROR 42000: Variable 'innodb_log_checksum_algorithm' can't be set to the value of 'foobar' +SELECT @@global.innodb_log_checksum_algorithm; +@@global.innodb_log_checksum_algorithm +strict_none +SET GLOBAL innodb_log_checksum_algorithm = 123; +ERROR 42000: Variable 'innodb_log_checksum_algorithm' can't be set to the value of '123' +SELECT @@global.innodb_log_checksum_algorithm; +@@global.innodb_log_checksum_algorithm +strict_none +SET GLOBAL innodb_log_checksum_algorithm = @orig; +SELECT @@global.innodb_log_checksum_algorithm; +@@global.innodb_log_checksum_algorithm +innodb 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 new file mode 100644 index 00000000000..8cb8d900b59 --- /dev/null +++ b/mysql-test/suite/sys_vars/r/innodb_log_compressed_pages_basic.result @@ -0,0 +1,69 @@ +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; +SELECT @@global.innodb_log_compressed_pages; +@@global.innodb_log_compressed_pages +0 +SET @@global.innodb_log_compressed_pages ='On' ; +SELECT @@global.innodb_log_compressed_pages; +@@global.innodb_log_compressed_pages +1 +SET @@global.innodb_log_compressed_pages ='Off' ; +SELECT @@global.innodb_log_compressed_pages; +@@global.innodb_log_compressed_pages +0 +SET @@global.innodb_log_compressed_pages = 1; +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; +SELECT @@global.innodb_log_compressed_pages; +@@global.innodb_log_compressed_pages +1 diff --git a/mysql-test/suite/sys_vars/r/innodb_merge_sort_block_size_basic.result b/mysql-test/suite/sys_vars/r/innodb_merge_sort_block_size_basic.result deleted file mode 100644 index 90c2954e43d..00000000000 --- a/mysql-test/suite/sys_vars/r/innodb_merge_sort_block_size_basic.result +++ /dev/null @@ -1,24 +0,0 @@ -SELECT @@global.innodb_merge_sort_block_size; -@@global.innodb_merge_sort_block_size -1048576 -SELECT @@session.innodb_merge_sort_block_size; -@@session.innodb_merge_sort_block_size -1048576 -SET @old_global=@@global.innodb_merge_sort_block_size; -SET @old_session=@@session.innodb_merge_sort_block_size; -SET @@global.innodb_merge_sort_block_size = 2*1024*1024; -SET @@session.innodb_merge_sort_block_size = 4*1024*1024; -SELECT @@global.innodb_merge_sort_block_size; -@@global.innodb_merge_sort_block_size -2097152 -SELECT @@session.innodb_merge_sort_block_size; -@@session.innodb_merge_sort_block_size -4194304 -SET @@global.innodb_merge_sort_block_size = 1024*1024*1024+1; -Warnings: -Warning 1292 Truncated incorrect innodb_merge_sort_block_size value: '1073741825' -SELECT @@global.innodb_merge_sort_block_size; -@@global.innodb_merge_sort_block_size -1073741824 -SET @@global.innodb_merge_sort_block_size=@old_global; -SET @@session.innodb_merge_sort_block_size=@old_session; diff --git a/mysql-test/suite/sys_vars/r/innodb_monitor_disable_basic.result b/mysql-test/suite/sys_vars/r/innodb_monitor_disable_basic.result index 7a7c0a6b6a2..ce57dbb2fdc 100644 --- a/mysql-test/suite/sys_vars/r/innodb_monitor_disable_basic.result +++ b/mysql-test/suite/sys_vars/r/innodb_monitor_disable_basic.result @@ -43,6 +43,7 @@ buffer_data_written disabled buffer_flush_batch_scanned disabled buffer_flush_batch_num_scan disabled buffer_flush_batch_scanned_per_call disabled +buffer_flush_batch_rescan disabled buffer_flush_batch_total_pages disabled buffer_flush_batches disabled buffer_flush_batch_pages disabled diff --git a/mysql-test/suite/sys_vars/r/innodb_monitor_enable_basic.result b/mysql-test/suite/sys_vars/r/innodb_monitor_enable_basic.result index 7a7c0a6b6a2..ce57dbb2fdc 100644 --- a/mysql-test/suite/sys_vars/r/innodb_monitor_enable_basic.result +++ b/mysql-test/suite/sys_vars/r/innodb_monitor_enable_basic.result @@ -43,6 +43,7 @@ buffer_data_written disabled buffer_flush_batch_scanned disabled buffer_flush_batch_num_scan disabled buffer_flush_batch_scanned_per_call disabled +buffer_flush_batch_rescan disabled buffer_flush_batch_total_pages disabled buffer_flush_batches disabled buffer_flush_batch_pages disabled diff --git a/mysql-test/suite/sys_vars/r/innodb_monitor_reset_all_basic.result b/mysql-test/suite/sys_vars/r/innodb_monitor_reset_all_basic.result index 7a7c0a6b6a2..ce57dbb2fdc 100644 --- a/mysql-test/suite/sys_vars/r/innodb_monitor_reset_all_basic.result +++ b/mysql-test/suite/sys_vars/r/innodb_monitor_reset_all_basic.result @@ -43,6 +43,7 @@ buffer_data_written disabled buffer_flush_batch_scanned disabled buffer_flush_batch_num_scan disabled buffer_flush_batch_scanned_per_call disabled +buffer_flush_batch_rescan disabled buffer_flush_batch_total_pages disabled buffer_flush_batches disabled buffer_flush_batch_pages disabled diff --git a/mysql-test/suite/sys_vars/r/innodb_monitor_reset_basic.result b/mysql-test/suite/sys_vars/r/innodb_monitor_reset_basic.result index 7a7c0a6b6a2..ce57dbb2fdc 100644 --- a/mysql-test/suite/sys_vars/r/innodb_monitor_reset_basic.result +++ b/mysql-test/suite/sys_vars/r/innodb_monitor_reset_basic.result @@ -43,6 +43,7 @@ buffer_data_written disabled buffer_flush_batch_scanned disabled buffer_flush_batch_num_scan disabled buffer_flush_batch_scanned_per_call disabled +buffer_flush_batch_rescan disabled buffer_flush_batch_total_pages disabled buffer_flush_batches disabled buffer_flush_batch_pages disabled diff --git a/mysql-test/suite/sys_vars/r/innodb_persistent_stats_root_page_basic.result b/mysql-test/suite/sys_vars/r/innodb_persistent_stats_root_page_basic.result deleted file mode 100644 index 38347ef8c68..00000000000 --- a/mysql-test/suite/sys_vars/r/innodb_persistent_stats_root_page_basic.result +++ /dev/null @@ -1,24 +0,0 @@ -SELECT @@global.innodb_persistent_stats_root_page; -@@global.innodb_persistent_stats_root_page -0 -SELECT COUNT(@@global.innodb_persistent_stats_root_page); -COUNT(@@global.innodb_persistent_stats_root_page) -1 -SET @@global.innodb_persistent_stats_root_page=100; -ERROR HY000: Variable 'innodb_persistent_stats_root_page' is a read only variable -SELECT @@global.innodb_persistent_stats_root_page = VARIABLE_VALUE -FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES -WHERE VARIABLE_NAME='innodb_persistent_stats_root_page'; -@@global.innodb_persistent_stats_root_page = VARIABLE_VALUE -1 -SELECT COUNT(*) FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES -WHERE VARIABLE_NAME='innodb_persistent_stats_root_page'; -COUNT(*) -1 -SELECT @@innodb_persistent_stats_root_page = @@global.innodb_persistent_stats_root_page; -@@innodb_persistent_stats_root_page = @@global.innodb_persistent_stats_root_page -1 -SELECT COUNT(@@local.innodb_persistent_stats_root_page); -ERROR HY000: Variable 'innodb_persistent_stats_root_page' is a GLOBAL variable -SELECT COUNT(@@session.innodb_persistent_stats_root_page); -ERROR HY000: Variable 'innodb_persistent_stats_root_page' is a GLOBAL variable diff --git a/mysql-test/suite/sys_vars/r/innodb_priority_cleaner_basic.result b/mysql-test/suite/sys_vars/r/innodb_priority_cleaner_basic.result new file mode 100644 index 00000000000..ae5e12ee64a --- /dev/null +++ b/mysql-test/suite/sys_vars/r/innodb_priority_cleaner_basic.result @@ -0,0 +1,31 @@ +SET @start_value = @@GLOBAL.innodb_priority_cleaner; +SELECT @@GLOBAL.innodb_priority_cleaner; +@@GLOBAL.innodb_priority_cleaner +0 +SELECT @@SESSION.innodb_priority_cleaner; +ERROR HY000: Variable 'innodb_priority_cleaner' is a GLOBAL variable +SET GLOBAL innodb_priority_cleaner='OFF'; +SELECT @@GLOBAL.innodb_priority_cleaner; +@@GLOBAL.innodb_priority_cleaner +0 +SET GLOBAL innodb_priority_cleaner='ON'; +SELECT @@GLOBAL.innodb_priority_cleaner; +@@GLOBAL.innodb_priority_cleaner +1 +SET GLOBAL innodb_priority_cleaner=0; +SELECT @@GLOBAL.innodb_priority_cleaner; +@@GLOBAL.innodb_priority_cleaner +0 +SET GLOBAL innodb_priority_cleaner=1; +SELECT @@GLOBAL.innodb_priority_cleaner; +@@GLOBAL.innodb_priority_cleaner +1 +SET GLOBAL innodb_priority_cleaner=1.1; +ERROR 42000: Incorrect argument type to variable 'innodb_priority_cleaner' +SET GLOBAL innodb_priority_cleaner=1e1; +ERROR 42000: Incorrect argument type to variable 'innodb_priority_cleaner' +SET GLOBAL innodb_priority_cleaner=2; +ERROR 42000: Variable 'innodb_priority_cleaner' can't be set to the value of '2' +SET GLOBAL innodb_priority_cleaner='foo'; +ERROR 42000: Variable 'innodb_priority_cleaner' can't be set to the value of 'foo' +SET GLOBAL innodb_priority_cleaner = @start_value; diff --git a/mysql-test/suite/sys_vars/r/innodb_priority_io_basic.result b/mysql-test/suite/sys_vars/r/innodb_priority_io_basic.result new file mode 100644 index 00000000000..70ccb5e4cf4 --- /dev/null +++ b/mysql-test/suite/sys_vars/r/innodb_priority_io_basic.result @@ -0,0 +1,31 @@ +SET @start_value = @@GLOBAL.innodb_priority_io; +SELECT @@GLOBAL.innodb_priority_io; +@@GLOBAL.innodb_priority_io +0 +SELECT @@SESSION.innodb_priority_io; +ERROR HY000: Variable 'innodb_priority_io' is a GLOBAL variable +SET GLOBAL innodb_priority_io='OFF'; +SELECT @@GLOBAL.innodb_priority_io; +@@GLOBAL.innodb_priority_io +0 +SET GLOBAL innodb_priority_io='ON'; +SELECT @@GLOBAL.innodb_priority_io; +@@GLOBAL.innodb_priority_io +1 +SET GLOBAL innodb_priority_io=0; +SELECT @@GLOBAL.innodb_priority_io; +@@GLOBAL.innodb_priority_io +0 +SET GLOBAL innodb_priority_io=1; +SELECT @@GLOBAL.innodb_priority_io; +@@GLOBAL.innodb_priority_io +1 +SET GLOBAL innodb_priority_io=1.1; +ERROR 42000: Incorrect argument type to variable 'innodb_priority_io' +SET GLOBAL innodb_priority_io=1e1; +ERROR 42000: Incorrect argument type to variable 'innodb_priority_io' +SET GLOBAL innodb_priority_io=2; +ERROR 42000: Variable 'innodb_priority_io' can't be set to the value of '2' +SET GLOBAL innodb_priority_io='foo'; +ERROR 42000: Variable 'innodb_priority_io' can't be set to the value of 'foo' +SET GLOBAL innodb_priority_io = @start_value; diff --git a/mysql-test/suite/sys_vars/r/innodb_priority_master_basic.result b/mysql-test/suite/sys_vars/r/innodb_priority_master_basic.result new file mode 100644 index 00000000000..d26ead2ff7e --- /dev/null +++ b/mysql-test/suite/sys_vars/r/innodb_priority_master_basic.result @@ -0,0 +1,31 @@ +SET @start_value = @@GLOBAL.innodb_priority_master; +SELECT @@GLOBAL.innodb_priority_master; +@@GLOBAL.innodb_priority_master +0 +SELECT @@SESSION.innodb_priority_master; +ERROR HY000: Variable 'innodb_priority_master' is a GLOBAL variable +SET GLOBAL innodb_priority_master='OFF'; +SELECT @@GLOBAL.innodb_priority_master; +@@GLOBAL.innodb_priority_master +0 +SET GLOBAL innodb_priority_master='ON'; +SELECT @@GLOBAL.innodb_priority_master; +@@GLOBAL.innodb_priority_master +1 +SET GLOBAL innodb_priority_master=0; +SELECT @@GLOBAL.innodb_priority_master; +@@GLOBAL.innodb_priority_master +0 +SET GLOBAL innodb_priority_master=1; +SELECT @@GLOBAL.innodb_priority_master; +@@GLOBAL.innodb_priority_master +1 +SET GLOBAL innodb_priority_master=1.1; +ERROR 42000: Incorrect argument type to variable 'innodb_priority_master' +SET GLOBAL innodb_priority_master=1e1; +ERROR 42000: Incorrect argument type to variable 'innodb_priority_master' +SET GLOBAL innodb_priority_master=2; +ERROR 42000: Variable 'innodb_priority_master' can't be set to the value of '2' +SET GLOBAL innodb_priority_master='foo'; +ERROR 42000: Variable 'innodb_priority_master' can't be set to the value of 'foo' +SET GLOBAL innodb_priority_master = @start_value; diff --git a/mysql-test/suite/sys_vars/r/innodb_priority_purge_basic.result b/mysql-test/suite/sys_vars/r/innodb_priority_purge_basic.result new file mode 100644 index 00000000000..57153ebf82a --- /dev/null +++ b/mysql-test/suite/sys_vars/r/innodb_priority_purge_basic.result @@ -0,0 +1,31 @@ +SET @start_value = @@GLOBAL.innodb_priority_purge; +SELECT @@GLOBAL.innodb_priority_purge; +@@GLOBAL.innodb_priority_purge +0 +SELECT @@SESSION.innodb_priority_purge; +ERROR HY000: Variable 'innodb_priority_purge' is a GLOBAL variable +SET GLOBAL innodb_priority_purge='OFF'; +SELECT @@GLOBAL.innodb_priority_purge; +@@GLOBAL.innodb_priority_purge +0 +SET GLOBAL innodb_priority_purge='ON'; +SELECT @@GLOBAL.innodb_priority_purge; +@@GLOBAL.innodb_priority_purge +1 +SET GLOBAL innodb_priority_purge=0; +SELECT @@GLOBAL.innodb_priority_purge; +@@GLOBAL.innodb_priority_purge +0 +SET GLOBAL innodb_priority_purge=1; +SELECT @@GLOBAL.innodb_priority_purge; +@@GLOBAL.innodb_priority_purge +1 +SET GLOBAL innodb_priority_purge=1.1; +ERROR 42000: Incorrect argument type to variable 'innodb_priority_purge' +SET GLOBAL innodb_priority_purge=1e1; +ERROR 42000: Incorrect argument type to variable 'innodb_priority_purge' +SET GLOBAL innodb_priority_purge=2; +ERROR 42000: Variable 'innodb_priority_purge' can't be set to the value of '2' +SET GLOBAL innodb_priority_purge='foo'; +ERROR 42000: Variable 'innodb_priority_purge' can't be set to the value of 'foo' +SET GLOBAL innodb_priority_purge = @start_value; diff --git a/mysql-test/suite/sys_vars/r/innodb_sched_priority_cleaner_basic.result b/mysql-test/suite/sys_vars/r/innodb_sched_priority_cleaner_basic.result new file mode 100644 index 00000000000..1183fb27732 --- /dev/null +++ b/mysql-test/suite/sys_vars/r/innodb_sched_priority_cleaner_basic.result @@ -0,0 +1,30 @@ +SET @start_value = @@GLOBAL.innodb_sched_priority_cleaner; +SELECT @@GLOBAL.innodb_sched_priority_cleaner; +@@GLOBAL.innodb_sched_priority_cleaner +19 +SELECT @@SESSION.innodb_sched_priority_cleaner; +ERROR HY000: Variable 'innodb_sched_priority_cleaner' is a GLOBAL variable +SET GLOBAL innodb_sched_priority_cleaner=19; +SELECT @@GLOBAL.innodb_sched_priority_cleaner; +@@GLOBAL.innodb_sched_priority_cleaner +19 +SET GLOBAL innodb_sched_priority_cleaner=5; +SELECT @@GLOBAL.innodb_sched_priority_cleaner; +@@GLOBAL.innodb_sched_priority_cleaner +5 +SET GLOBAL innodb_sched_priority_cleaner=0; +SELECT @@GLOBAL.innodb_sched_priority_cleaner; +@@GLOBAL.innodb_sched_priority_cleaner +0 +SET GLOBAL innodb_sched_priority_cleaner=-1; +Warnings: +Warning 1292 Truncated incorrect innodb_sched_priority_cleaner value: '-1' +SELECT @@GLOBAL.innodb_sched_priority_cleaner; +@@GLOBAL.innodb_sched_priority_cleaner +0 +SET GLOBAL innodb_sched_priority_cleaner=1.1; +ERROR 42000: Incorrect argument type to variable 'innodb_sched_priority_cleaner' +SET GLOBAL innodb_sched_priority_cleaner=1e1; +ERROR 42000: Incorrect argument type to variable 'innodb_sched_priority_cleaner' +SET GLOBAL innodb_sched_priority_cleaner='foo'; +ERROR 42000: Incorrect argument type to variable 'innodb_sched_priority_cleaner' diff --git a/mysql-test/suite/sys_vars/r/innodb_sched_priority_io_basic.result b/mysql-test/suite/sys_vars/r/innodb_sched_priority_io_basic.result new file mode 100644 index 00000000000..5fd7705bfaf --- /dev/null +++ b/mysql-test/suite/sys_vars/r/innodb_sched_priority_io_basic.result @@ -0,0 +1,30 @@ +SET @start_value = @@GLOBAL.innodb_sched_priority_io; +SELECT @@GLOBAL.innodb_sched_priority_io; +@@GLOBAL.innodb_sched_priority_io +19 +SELECT @@SESSION.innodb_sched_priority_io; +ERROR HY000: Variable 'innodb_sched_priority_io' is a GLOBAL variable +SET GLOBAL innodb_sched_priority_io=19; +SELECT @@GLOBAL.innodb_sched_priority_io; +@@GLOBAL.innodb_sched_priority_io +19 +SET GLOBAL innodb_sched_priority_io=5; +SELECT @@GLOBAL.innodb_sched_priority_io; +@@GLOBAL.innodb_sched_priority_io +5 +SET GLOBAL innodb_sched_priority_io=0; +SELECT @@GLOBAL.innodb_sched_priority_io; +@@GLOBAL.innodb_sched_priority_io +0 +SET GLOBAL innodb_sched_priority_io=-1; +Warnings: +Warning 1292 Truncated incorrect innodb_sched_priority_io value: '-1' +SELECT @@GLOBAL.innodb_sched_priority_io; +@@GLOBAL.innodb_sched_priority_io +0 +SET GLOBAL innodb_sched_priority_io=1.1; +ERROR 42000: Incorrect argument type to variable 'innodb_sched_priority_io' +SET GLOBAL innodb_sched_priority_io=1e1; +ERROR 42000: Incorrect argument type to variable 'innodb_sched_priority_io' +SET GLOBAL innodb_sched_priority_io='foo'; +ERROR 42000: Incorrect argument type to variable 'innodb_sched_priority_io' diff --git a/mysql-test/suite/sys_vars/r/innodb_sched_priority_master_basic.result b/mysql-test/suite/sys_vars/r/innodb_sched_priority_master_basic.result new file mode 100644 index 00000000000..caa72f58369 --- /dev/null +++ b/mysql-test/suite/sys_vars/r/innodb_sched_priority_master_basic.result @@ -0,0 +1,30 @@ +SET @start_value = @@GLOBAL.innodb_sched_priority_master; +SELECT @@GLOBAL.innodb_sched_priority_master; +@@GLOBAL.innodb_sched_priority_master +19 +SELECT @@SESSION.innodb_sched_priority_master; +ERROR HY000: Variable 'innodb_sched_priority_master' is a GLOBAL variable +SET GLOBAL innodb_sched_priority_master=19; +SELECT @@GLOBAL.innodb_sched_priority_master; +@@GLOBAL.innodb_sched_priority_master +19 +SET GLOBAL innodb_sched_priority_master=5; +SELECT @@GLOBAL.innodb_sched_priority_master; +@@GLOBAL.innodb_sched_priority_master +5 +SET GLOBAL innodb_sched_priority_master=0; +SELECT @@GLOBAL.innodb_sched_priority_master; +@@GLOBAL.innodb_sched_priority_master +0 +SET GLOBAL innodb_sched_priority_master=-1; +Warnings: +Warning 1292 Truncated incorrect innodb_sched_priority_master value: '-1' +SELECT @@GLOBAL.innodb_sched_priority_master; +@@GLOBAL.innodb_sched_priority_master +0 +SET GLOBAL innodb_sched_priority_master=1.1; +ERROR 42000: Incorrect argument type to variable 'innodb_sched_priority_master' +SET GLOBAL innodb_sched_priority_master=1e1; +ERROR 42000: Incorrect argument type to variable 'innodb_sched_priority_master' +SET GLOBAL innodb_sched_priority_master='foo'; +ERROR 42000: Incorrect argument type to variable 'innodb_sched_priority_master' diff --git a/mysql-test/suite/sys_vars/r/innodb_sched_priority_purge_basic.result b/mysql-test/suite/sys_vars/r/innodb_sched_priority_purge_basic.result new file mode 100644 index 00000000000..e3b9c627214 --- /dev/null +++ b/mysql-test/suite/sys_vars/r/innodb_sched_priority_purge_basic.result @@ -0,0 +1,30 @@ +SET @start_value = @@GLOBAL.innodb_sched_priority_purge; +SELECT @@GLOBAL.innodb_sched_priority_purge; +@@GLOBAL.innodb_sched_priority_purge +19 +SELECT @@SESSION.innodb_sched_priority_purge; +ERROR HY000: Variable 'innodb_sched_priority_purge' is a GLOBAL variable +SET GLOBAL innodb_sched_priority_purge=19; +SELECT @@GLOBAL.innodb_sched_priority_purge; +@@GLOBAL.innodb_sched_priority_purge +19 +SET GLOBAL innodb_sched_priority_purge=5; +SELECT @@GLOBAL.innodb_sched_priority_purge; +@@GLOBAL.innodb_sched_priority_purge +5 +SET GLOBAL innodb_sched_priority_purge=0; +SELECT @@GLOBAL.innodb_sched_priority_purge; +@@GLOBAL.innodb_sched_priority_purge +0 +SET GLOBAL innodb_sched_priority_purge=-1; +Warnings: +Warning 1292 Truncated incorrect innodb_sched_priority_purge value: '-1' +SELECT @@GLOBAL.innodb_sched_priority_purge; +@@GLOBAL.innodb_sched_priority_purge +0 +SET GLOBAL innodb_sched_priority_purge=1.1; +ERROR 42000: Incorrect argument type to variable 'innodb_sched_priority_purge' +SET GLOBAL innodb_sched_priority_purge=1e1; +ERROR 42000: Incorrect argument type to variable 'innodb_sched_priority_purge' +SET GLOBAL innodb_sched_priority_purge='foo'; +ERROR 42000: Incorrect argument type to variable 'innodb_sched_priority_purge' diff --git a/mysql-test/suite/sys_vars/r/innodb_sync_array_size_basic.result b/mysql-test/suite/sys_vars/r/innodb_sync_array_size_basic.result index df626e3373e..526dd7d8350 100644 --- a/mysql-test/suite/sys_vars/r/innodb_sync_array_size_basic.result +++ b/mysql-test/suite/sys_vars/r/innodb_sync_array_size_basic.result @@ -1,7 +1,3 @@ -SET @start_global_value = @@global.innodb_sync_array_size; -SELECT @start_global_value; -@start_global_value -1 Valid values are between 0 and 1024 SELECT @@global.innodb_sync_array_size between 0 and 1024; @@global.innodb_sync_array_size between 0 and 1024 @@ -11,69 +7,24 @@ SELECT @@global.innodb_sync_array_size; 1 SELECT @@session.innodb_sync_array_size; ERROR HY000: Variable 'innodb_sync_array_size' is a GLOBAL variable -SHOW global variables LIKE 'innodb_sync_array_size'; +SHOW GLOBAL variables LIKE 'innodb_sync_array_size'; Variable_name Value innodb_sync_array_size 1 -SHOW session variables LIKE 'innodb_sync_array_size'; +SHOW SESSION variables LIKE 'innodb_sync_array_size'; Variable_name Value innodb_sync_array_size 1 SELECT * FROM information_schema.global_variables -where variable_name='innodb_sync_array_size'; +WHERE variable_name='innodb_sync_array_size'; VARIABLE_NAME VARIABLE_VALUE INNODB_SYNC_ARRAY_SIZE 1 SELECT * FROM information_schema.session_variables -where variable_name='innodb_sync_array_size'; -VARIABLE_NAME VARIABLE_VALUE -INNODB_SYNC_ARRAY_SIZE 1 -SET global innodb_sync_array_size=10; -SELECT @@global.innodb_sync_array_size; -@@global.innodb_sync_array_size -10 -SELECT * FROM information_schema.global_variables -where variable_name='innodb_sync_array_size'; -VARIABLE_NAME VARIABLE_VALUE -INNODB_SYNC_ARRAY_SIZE 10 -SELECT * FROM information_schema.session_variables -where variable_name='innodb_sync_array_size'; -VARIABLE_NAME VARIABLE_VALUE -INNODB_SYNC_ARRAY_SIZE 10 -SET session innodb_sync_array_size=1; -ERROR HY000: Variable 'innodb_sync_array_size' is a GLOBAL variable and should be set with SET GLOBAL -SET global innodb_sync_array_size=1.1; -ERROR 42000: Incorrect argument type to variable 'innodb_sync_array_size' -SET global innodb_sync_array_size=1e1; -ERROR 42000: Incorrect argument type to variable 'innodb_sync_array_size' -SET global innodb_sync_array_size="foo"; -ERROR 42000: Incorrect argument type to variable 'innodb_sync_array_size' -SET global innodb_sync_array_size=-7; -Warnings: -Warning 1292 Truncated incorrect innodb_sync_array_size value: '-7' -SELECT @@global.innodb_sync_array_size; -@@global.innodb_sync_array_size -1 -SELECT * FROM information_schema.global_variables -where variable_name='innodb_sync_array_size'; +WHERE variable_name='innodb_sync_array_size'; VARIABLE_NAME VARIABLE_VALUE INNODB_SYNC_ARRAY_SIZE 1 -SET global innodb_sync_array_size=96; -SELECT @@global.innodb_sync_array_size; -@@global.innodb_sync_array_size -96 -SELECT * FROM information_schema.global_variables -where variable_name='innodb_sync_array_size'; -VARIABLE_NAME VARIABLE_VALUE -INNODB_SYNC_ARRAY_SIZE 96 -SET global innodb_sync_array_size=0; -Warnings: -Warning 1292 Truncated incorrect innodb_sync_array_size value: '0' -SELECT @@global.innodb_sync_array_size; -@@global.innodb_sync_array_size -1 -SET global innodb_sync_array_size=64; -SELECT @@global.innodb_sync_array_size; -@@global.innodb_sync_array_size -64 -SET @@global.innodb_sync_array_size = @start_global_value; +SET GLOBAL innodb_sync_array_size=10; +ERROR HY000: Variable 'innodb_sync_array_size' is a read only variable +SET SESSION innodb_sync_array_size=10; +ERROR HY000: Variable 'innodb_sync_array_size' is a read only variable SELECT @@global.innodb_sync_array_size; @@global.innodb_sync_array_size 1 |