diff options
author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-04-16 12:12:26 +0300 |
---|---|---|
committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-04-16 12:12:26 +0300 |
commit | af912664989e0c3ee9cdb6caf8ec439029e7405c (patch) | |
tree | 9ab694ec5d18e0ab998eb4f52ee86129e5fbd3ae /mysql-test/suite/sys_vars/r | |
parent | 5679a2b6b342abc9d80bcf784a1a35f240be9d87 (diff) | |
parent | 6577a7a8f20538df80b851698e21095311aae190 (diff) | |
download | mariadb-git-af912664989e0c3ee9cdb6caf8ec439029e7405c.tar.gz |
Merge 10.3 into 10.4
In main.index_merge_myisam we remove the test that was added in
commit a2d24def8cc42d27c72d833abfb39ef24a2b96ba because
it duplicates the test case that was added in
commit 5af12e463549e4bbc2ce6ab720d78937d5e5db4e.
Diffstat (limited to 'mysql-test/suite/sys_vars/r')
12 files changed, 25 insertions, 25 deletions
diff --git a/mysql-test/suite/sys_vars/r/innodb_compression_failure_threshold_pct_basic.result b/mysql-test/suite/sys_vars/r/innodb_compression_failure_threshold_pct_basic.result index ae556ceedb2..3a5eb46df68 100644 --- a/mysql-test/suite/sys_vars/r/innodb_compression_failure_threshold_pct_basic.result +++ b/mysql-test/suite/sys_vars/r/innodb_compression_failure_threshold_pct_basic.result @@ -36,7 +36,7 @@ SELECT @@global.innodb_compression_failure_threshold_pct; '#--------------------FN_DYNVARS_046_04-------------------------#' SET @@global.innodb_compression_failure_threshold_pct = -1; Warnings: -Warning 1292 Truncated incorrect innodb_compression_failure_thres value: '-1' +Warning 1292 Truncated incorrect innodb_compression_failure_th... value: '-1' SELECT @@global.innodb_compression_failure_threshold_pct; @@global.innodb_compression_failure_threshold_pct 0 @@ -57,7 +57,7 @@ SELECT @@global.innodb_compression_failure_threshold_pct; 0 SET @@global.innodb_compression_failure_threshold_pct = 101; Warnings: -Warning 1292 Truncated incorrect innodb_compression_failure_thres value: '101' +Warning 1292 Truncated incorrect innodb_compression_failure_th... value: '101' SELECT @@global.innodb_compression_failure_threshold_pct; @@global.innodb_compression_failure_threshold_pct 100 diff --git a/mysql-test/suite/sys_vars/r/innodb_defragment_fill_factor_n_recs_basic.result b/mysql-test/suite/sys_vars/r/innodb_defragment_fill_factor_n_recs_basic.result index ffbeb39fe33..a8ca081d0f0 100644 --- a/mysql-test/suite/sys_vars/r/innodb_defragment_fill_factor_n_recs_basic.result +++ b/mysql-test/suite/sys_vars/r/innodb_defragment_fill_factor_n_recs_basic.result @@ -19,13 +19,13 @@ SELECT @@global.innodb_defragment_fill_factor_n_recs; 1 SET @@global.innodb_defragment_fill_factor_n_recs = -1; Warnings: -Warning 1292 Truncated incorrect innodb_defragment_fill_factor_n_ value: '-1' +Warning 1292 Truncated incorrect innodb_defragment_fill_factor... value: '-1' SELECT @@global.innodb_defragment_fill_factor_n_recs; @@global.innodb_defragment_fill_factor_n_recs 1 SET @@global.innodb_defragment_fill_factor_n_recs = 10000; Warnings: -Warning 1292 Truncated incorrect innodb_defragment_fill_factor_n_ value: '10000' +Warning 1292 Truncated incorrect innodb_defragment_fill_factor... value: '10000' SELECT @@global.innodb_defragment_fill_factor_n_recs; @@global.innodb_defragment_fill_factor_n_recs 100 diff --git a/mysql-test/suite/sys_vars/r/innodb_limit_optimistic_insert_debug_basic.result b/mysql-test/suite/sys_vars/r/innodb_limit_optimistic_insert_debug_basic.result index 3d4f401aad1..589de8fa5fc 100644 --- a/mysql-test/suite/sys_vars/r/innodb_limit_optimistic_insert_debug_basic.result +++ b/mysql-test/suite/sys_vars/r/innodb_limit_optimistic_insert_debug_basic.result @@ -49,7 +49,7 @@ set global innodb_limit_optimistic_insert_debug='foo'; ERROR 42000: Incorrect argument type to variable 'innodb_limit_optimistic_insert_debug' set global innodb_limit_optimistic_insert_debug=-2; Warnings: -Warning 1292 Truncated incorrect innodb_limit_optimistic_insert_d value: '-2' +Warning 1292 Truncated incorrect innodb_limit_optimistic_inser... value: '-2' set global innodb_limit_optimistic_insert_debug=1e1; ERROR 42000: Incorrect argument type to variable 'innodb_limit_optimistic_insert_debug' SET @@global.innodb_limit_optimistic_insert_debug = @start_global_value; diff --git a/mysql-test/suite/sys_vars/r/innodb_merge_threshold_set_all_debug_basic.result b/mysql-test/suite/sys_vars/r/innodb_merge_threshold_set_all_debug_basic.result index 6e325d0be38..c05432fe2b9 100644 --- a/mysql-test/suite/sys_vars/r/innodb_merge_threshold_set_all_debug_basic.result +++ b/mysql-test/suite/sys_vars/r/innodb_merge_threshold_set_all_debug_basic.result @@ -10,13 +10,13 @@ SELECT @@global.innodb_merge_threshold_set_all_debug; 1 set global innodb_merge_threshold_set_all_debug = 51; Warnings: -Warning 1292 Truncated incorrect innodb_merge_threshold_set_all_d value: '51' +Warning 1292 Truncated incorrect innodb_merge_threshold_set_al... value: '51' SELECT @@global.innodb_merge_threshold_set_all_debug; @@global.innodb_merge_threshold_set_all_debug 50 set global innodb_merge_threshold_set_all_debug = 0; Warnings: -Warning 1292 Truncated incorrect innodb_merge_threshold_set_all_d value: '0' +Warning 1292 Truncated incorrect innodb_merge_threshold_set_al... value: '0' SELECT @@global.innodb_merge_threshold_set_all_debug; @@global.innodb_merge_threshold_set_all_debug 1 diff --git a/mysql-test/suite/sys_vars/r/innodb_purge_rseg_truncate_frequency_basic.result b/mysql-test/suite/sys_vars/r/innodb_purge_rseg_truncate_frequency_basic.result index 79eb0743dfa..65387032dc6 100644 --- a/mysql-test/suite/sys_vars/r/innodb_purge_rseg_truncate_frequency_basic.result +++ b/mysql-test/suite/sys_vars/r/innodb_purge_rseg_truncate_frequency_basic.result @@ -36,13 +36,13 @@ SELECT @@global.innodb_purge_rseg_truncate_frequency; '#--------------------FN_DYNVARS_046_05-------------------------#' SET @@global.innodb_purge_rseg_truncate_frequency = -1; Warnings: -Warning 1292 Truncated incorrect innodb_purge_rseg_truncate_frequ value: '-1' +Warning 1292 Truncated incorrect innodb_purge_rseg_truncate_fr... value: '-1' SELECT @@global.innodb_purge_rseg_truncate_frequency; @@global.innodb_purge_rseg_truncate_frequency 1 SET @@global.innodb_purge_rseg_truncate_frequency = -1024; Warnings: -Warning 1292 Truncated incorrect innodb_purge_rseg_truncate_frequ value: '-1024' +Warning 1292 Truncated incorrect innodb_purge_rseg_truncate_fr... value: '-1024' SELECT @@global.innodb_purge_rseg_truncate_frequency; @@global.innodb_purge_rseg_truncate_frequency 1 @@ -103,7 +103,7 @@ SELECT @@global.innodb_purge_rseg_truncate_frequency; 1 SET @@global.innodb_purge_rseg_truncate_frequency = FALSE; Warnings: -Warning 1292 Truncated incorrect innodb_purge_rseg_truncate_frequ value: '0' +Warning 1292 Truncated incorrect innodb_purge_rseg_truncate_fr... value: '0' SELECT @@global.innodb_purge_rseg_truncate_frequency; @@global.innodb_purge_rseg_truncate_frequency 1 diff --git a/mysql-test/suite/sys_vars/r/innodb_stats_persistent_sample_pages_basic.result b/mysql-test/suite/sys_vars/r/innodb_stats_persistent_sample_pages_basic.result index ec211b693df..68ba8bbfb4a 100644 --- a/mysql-test/suite/sys_vars/r/innodb_stats_persistent_sample_pages_basic.result +++ b/mysql-test/suite/sys_vars/r/innodb_stats_persistent_sample_pages_basic.result @@ -45,7 +45,7 @@ select @@global.innodb_stats_persistent_sample_pages; 20 SET global innodb_stats_persistent_sample_pages=0; Warnings: -Warning 1292 Truncated incorrect innodb_stats_persistent_sample_p value: '0' +Warning 1292 Truncated incorrect innodb_stats_persistent_sampl... value: '0' SELECT @@global.innodb_stats_persistent_sample_pages; @@global.innodb_stats_persistent_sample_pages 1 @@ -71,7 +71,7 @@ SELECT @@global.innodb_stats_persistent_sample_pages; 10 SET global innodb_stats_persistent_sample_pages=-7; Warnings: -Warning 1292 Truncated incorrect innodb_stats_persistent_sample_p value: '-7' +Warning 1292 Truncated incorrect innodb_stats_persistent_sampl... value: '-7' SELECT @@global.innodb_stats_persistent_sample_pages; @@global.innodb_stats_persistent_sample_pages 1 diff --git a/mysql-test/suite/sys_vars/r/innodb_stats_transient_sample_pages_basic.result b/mysql-test/suite/sys_vars/r/innodb_stats_transient_sample_pages_basic.result index 1ea5ac3d3bc..4113b168f39 100644 --- a/mysql-test/suite/sys_vars/r/innodb_stats_transient_sample_pages_basic.result +++ b/mysql-test/suite/sys_vars/r/innodb_stats_transient_sample_pages_basic.result @@ -53,7 +53,7 @@ SET global innodb_stats_transient_sample_pages=' '; ERROR 42000: Incorrect argument type to variable 'innodb_stats_transient_sample_pages' SET global innodb_stats_transient_sample_pages=-7; Warnings: -Warning 1292 Truncated incorrect innodb_stats_transient_sample_pa value: '-7' +Warning 1292 Truncated incorrect innodb_stats_transient_sample... value: '-7' SELECT @@global.innodb_stats_transient_sample_pages; @@global.innodb_stats_transient_sample_pages 1 diff --git a/mysql-test/suite/sys_vars/r/innodb_tmpdir_basic.result b/mysql-test/suite/sys_vars/r/innodb_tmpdir_basic.result index be10c93b56b..0eebc758cf6 100644 --- a/mysql-test/suite/sys_vars/r/innodb_tmpdir_basic.result +++ b/mysql-test/suite/sys_vars/r/innodb_tmpdir_basic.result @@ -24,11 +24,11 @@ ERROR 42000: Incorrect argument type to variable 'innodb_tmpdir' set global innodb_tmpdir=1e1; ERROR 42000: Incorrect argument type to variable 'innodb_tmpdir' set global innodb_tmpdir=repeat('a',1000); -ERROR 42000: Variable 'innodb_tmpdir' can't be set to the value of 'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa' +ERROR 42000: Variable 'innodb_tmpdir' can't be set to the value of 'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa...' show warnings; Level Code Message Warning 1210 Path length should not exceed 512 bytes -Error 1231 Variable 'innodb_tmpdir' can't be set to the value of 'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa' +Error 1231 Variable 'innodb_tmpdir' can't be set to the value of 'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa...' SET @@global.innodb_tmpdir = @start_global_value; SELECT @@global.innodb_tmpdir; @@global.innodb_tmpdir diff --git a/mysql-test/suite/sys_vars/r/optimizer_selectivity_sampling_limit_basic.result b/mysql-test/suite/sys_vars/r/optimizer_selectivity_sampling_limit_basic.result index 4df024b9cec..54d5e796267 100644 --- a/mysql-test/suite/sys_vars/r/optimizer_selectivity_sampling_limit_basic.result +++ b/mysql-test/suite/sys_vars/r/optimizer_selectivity_sampling_limit_basic.result @@ -30,7 +30,7 @@ SELECT @@global.optimizer_selectivity_sampling_limit; 100 SET @@global.optimizer_selectivity_sampling_limit = 9; Warnings: -Warning 1292 Truncated incorrect optimizer_selectivity_sampling_l value: '9' +Warning 1292 Truncated incorrect optimizer_selectivity_samplin... value: '9' SELECT @@global.optimizer_selectivity_sampling_limit; @@global.optimizer_selectivity_sampling_limit 10 @@ -56,7 +56,7 @@ SELECT @@global.optimizer_selectivity_sampling_limit; 4294967295 SET @@global.optimizer_selectivity_sampling_limit = 4294967296; Warnings: -Warning 1292 Truncated incorrect optimizer_selectivity_sampling_l value: '4294967296' +Warning 1292 Truncated incorrect optimizer_selectivity_samplin... value: '4294967296' SELECT @@global.optimizer_selectivity_sampling_limit; @@global.optimizer_selectivity_sampling_limit 4294967295 @@ -66,7 +66,7 @@ SELECT @@session.optimizer_selectivity_sampling_limit; 100 SET @@session.optimizer_selectivity_sampling_limit = 9; Warnings: -Warning 1292 Truncated incorrect optimizer_selectivity_sampling_l value: '9' +Warning 1292 Truncated incorrect optimizer_selectivity_samplin... value: '9' SELECT @@session.optimizer_selectivity_sampling_limit; @@session.optimizer_selectivity_sampling_limit 10 @@ -92,7 +92,7 @@ SELECT @@session.optimizer_selectivity_sampling_limit; 4294967295 SET @@session.optimizer_selectivity_sampling_limit = 4294967296; Warnings: -Warning 1292 Truncated incorrect optimizer_selectivity_sampling_l value: '4294967296' +Warning 1292 Truncated incorrect optimizer_selectivity_samplin... value: '4294967296' SELECT @@session.optimizer_selectivity_sampling_limit; @@session.optimizer_selectivity_sampling_limit 4294967295 diff --git a/mysql-test/suite/sys_vars/r/optimizer_use_condition_selectivity_basic.result b/mysql-test/suite/sys_vars/r/optimizer_use_condition_selectivity_basic.result index 1e6d420a9d7..4b92a80be03 100644 --- a/mysql-test/suite/sys_vars/r/optimizer_use_condition_selectivity_basic.result +++ b/mysql-test/suite/sys_vars/r/optimizer_use_condition_selectivity_basic.result @@ -3,7 +3,7 @@ SET @start_session_value = @@session.optimizer_use_condition_selectivity; '#--------------------FN_DYNVARS_115_03-------------------------#' SET @@global.optimizer_use_condition_selectivity = 0; Warnings: -Warning 1292 Truncated incorrect optimizer_use_condition_selectiv value: '0' +Warning 1292 Truncated incorrect optimizer_use_condition_selec... value: '0' SELECT @@global.optimizer_use_condition_selectivity; @@global.optimizer_use_condition_selectivity 1 @@ -29,14 +29,14 @@ SELECT @@global.optimizer_use_condition_selectivity; 5 SET @@global.optimizer_use_condition_selectivity = 6; Warnings: -Warning 1292 Truncated incorrect optimizer_use_condition_selectiv value: '6' +Warning 1292 Truncated incorrect optimizer_use_condition_selec... value: '6' SELECT @@global.optimizer_use_condition_selectivity; @@global.optimizer_use_condition_selectivity 5 '#--------------------FN_DYNVARS_115_04-------------------------#' SET @@session.optimizer_use_condition_selectivity = 0; Warnings: -Warning 1292 Truncated incorrect optimizer_use_condition_selectiv value: '0' +Warning 1292 Truncated incorrect optimizer_use_condition_selec... value: '0' SELECT @@session.optimizer_use_condition_selectivity; @@session.optimizer_use_condition_selectivity 1 @@ -62,7 +62,7 @@ SELECT @@session.optimizer_use_condition_selectivity; 5 SET @@session.optimizer_use_condition_selectivity = 6; Warnings: -Warning 1292 Truncated incorrect optimizer_use_condition_selectiv value: '6' +Warning 1292 Truncated incorrect optimizer_use_condition_selec... value: '6' SELECT @@session.optimizer_use_condition_selectivity; @@session.optimizer_use_condition_selectivity 5 diff --git a/mysql-test/suite/sys_vars/r/sysvars_server_embedded.result b/mysql-test/suite/sys_vars/r/sysvars_server_embedded.result index 4ecf169b75e..e6a68346947 100644 --- a/mysql-test/suite/sys_vars/r/sysvars_server_embedded.result +++ b/mysql-test/suite/sys_vars/r/sysvars_server_embedded.result @@ -3405,7 +3405,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME TCP_KEEPALIVE_TIME VARIABLE_SCOPE GLOBAL VARIABLE_TYPE INT -VARIABLE_COMMENT Timeout, in milliseconds, with no activity until the first TCP keep-alive packet is sent.If set to 0, system dependent default is used. +VARIABLE_COMMENT Timeout, in seconds, with no activity until the first TCP keep-alive packet is sent.If set to 0, system dependent default is used. NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 2147483 NUMERIC_BLOCK_SIZE 1 diff --git a/mysql-test/suite/sys_vars/r/sysvars_server_notembedded.result b/mysql-test/suite/sys_vars/r/sysvars_server_notembedded.result index 7d971bcdbad..d64f341f775 100644 --- a/mysql-test/suite/sys_vars/r/sysvars_server_notembedded.result +++ b/mysql-test/suite/sys_vars/r/sysvars_server_notembedded.result @@ -4095,7 +4095,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME TCP_KEEPALIVE_TIME VARIABLE_SCOPE GLOBAL VARIABLE_TYPE INT -VARIABLE_COMMENT Timeout, in milliseconds, with no activity until the first TCP keep-alive packet is sent.If set to 0, system dependent default is used. +VARIABLE_COMMENT Timeout, in seconds, with no activity until the first TCP keep-alive packet is sent.If set to 0, system dependent default is used. NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 2147483 NUMERIC_BLOCK_SIZE 1 |