1 files changed, 14 insertions, 9 deletions
diff --git a/mysql-test/main/stat_tables.test b/mysql-test/main/stat_tables.test
index b5a804598a4..8dd9c361cd8 100644
--- a/mysql-test/main/stat_tables.test
+++ b/mysql-test/main/stat_tables.test
@@ -4,10 +4,13 @@ select @@global.use_stat_tables;
 select @@session.use_stat_tables;
 
 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';
 
 --disable_warnings
 DROP DATABASE IF EXISTS dbt3_s001;
@@ -515,7 +518,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);
@@ -543,11 +545,7 @@ update mysql.column_stats set min_value='2004-0-31123' where db_name='test' and
 select min_value from mysql.column_stats where db_name='test' and table_name='t1';
 select * from t1;
 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;
 
 --echo #
 --echo # MDEV-17255: New optimizer defaults and ANALYZE TABLE
@@ -590,4 +588,11 @@ select * from mysql.column_stats;
 analyze
 select * from t1 where a=1 and b=3;
 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;
+