diff options
Diffstat (limited to 'mysql-test/main/stat_tables_innodb.result')
| -rw-r--r-- | mysql-test/main/stat_tables_innodb.result | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/mysql-test/main/stat_tables_innodb.result b/mysql-test/main/stat_tables_innodb.result index c6c0ccad60c..c2f6981fa16 100644 --- a/mysql-test/main/stat_tables_innodb.result +++ b/mysql-test/main/stat_tables_innodb.result @@ -13,9 +13,12 @@ select @@session.use_stat_tables; @@session.use_stat_tables COMPLEMENTARY set @save_use_stat_tables=@@use_stat_tables; +set @save_histogram_size=@@global.histogram_size; +set @@global.histogram_size=0,@@local.histogram_size=0; +set optimizer_use_condition_selectivity=4; set use_stat_tables='preferably'; -set @tmp_stt_hs=@@histogram_size, @tmp_stt_ht=@@histogram_type; -set histogram_size=0, histogram_type='single_prec_hb'; +set @save_histogram_type=@@histogram_type; +set histogram_type='single_prec_hb'; DROP DATABASE IF EXISTS dbt3_s001; CREATE DATABASE dbt3_s001; use dbt3_s001; @@ -784,7 +787,6 @@ set names utf8; set @save_optimizer_use_condition_selectivity=@@optimizer_use_condition_selectivity; set optimizer_use_condition_selectivity=4; set use_stat_tables=preferably; -set @save_histogram_size= @@histogram_size; set histogram_size=255; create table t1 ( a varchar(255) character set utf8); insert into t1 values (REPEAT('ӥ',255)), (REPEAT('ç',255)); @@ -831,10 +833,7 @@ col1 2004-02-29 0000-10-31 drop table t1; -set @@sql_mode= @save_sql_mode; -set use_stat_tables=@save_use_stat_tables; -set @@histogram_size= @save_histogram_size; -set @@optimizer_use_condition_selectivity=@save_optimizer_use_condition_selectivity; +set histogram_size=0; # # MDEV-17255: New optimizer defaults and ANALYZE TABLE # @@ -890,7 +889,12 @@ select * from t1 where a=1 and b=3; id select_type table type possible_keys key key_len ref rows r_rows filtered r_filtered Extra 1 SIMPLE t1 ALL NULL NULL NULL NULL 10 10.00 2.78 10.00 Using where drop table t1; -set histogram_size=@tmp_stt_hs, histogram_type=@tmp_stt_ht; +set @@global.histogram_size=@save_histogram_size; +set @@histogram_size= @save_histogram_size; +set @@histogram_type=@save_histogram_type; +set @@optimizer_use_condition_selectivity=@save_optimizer_use_condition_selectivity; +set @@sql_mode= @save_sql_mode; +set @@use_stat_tables=@save_use_stat_tables; set global innodb_stats_persistent= @innodb_stats_persistent_save; set global innodb_stats_persistent_sample_pages= @innodb_stats_persistent_sample_pages_save; |