Fixing a test to reset to original state

MariaDB · Sep 17, 2019 · c471bfb · c471bfb
1 parent fb3e3a6
commit c471bfb
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/mysql-test/r/stat_tables.result b/mysql-test/r/stat_tables.result
@@ -797,9 +797,10 @@ col1
 2004-01-01
 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;
+drop table t1;
+# please keep this at the last
 set @@global.histogram_size=@save_histogram_size;
diff --git a/mysql-test/r/stat_tables_innodb.result b/mysql-test/r/stat_tables_innodb.result
@@ -824,11 +824,12 @@ col1
 2004-01-01
 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;
+drop table t1;
+# please keep this at the last
 set @@global.histogram_size=@save_histogram_size;
 set optimizer_switch=@save_optimizer_switch_for_stat_tables_test;
 SET SESSION STORAGE_ENGINE=DEFAULT;
diff --git a/mysql-test/t/stat_tables.test b/mysql-test/t/stat_tables.test
@@ -540,10 +540,11 @@ analyze table t1;
 update mysql.column_stats set min_value='2004-0-31123' where db_name='test' and table_name='t1';
 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;
+drop table t1;
+
+--echo # please keep this at the last
 set @@global.histogram_size=@save_histogram_size;