diff --git a/mysql-test/include/percona_nonflushing_analyze_debug.inc b/mysql-test/include/percona_nonflushing_analyze_debug.inc index b2f6df51ab8..95621c70d5c 100644 --- a/mysql-test/include/percona_nonflushing_analyze_debug.inc +++ b/mysql-test/include/percona_nonflushing_analyze_debug.inc @@ -16,8 +16,11 @@ send_eval SELECT * FROM $percona_nonflushing_analyze_table; SET DEBUG_SYNC="now WAIT_FOR idx_scan_in_progress"; +set @tmp=@@use_stat_tables; +set use_stat_tables='preferably_for_queries'; eval ANALYZE TABLE $percona_nonflushing_analyze_table; +set use_stat_tables=@tmp; # With the bug fixed this should not block eval SELECT * FROM $percona_nonflushing_analyze_table; diff --git a/mysql-test/main/percona_nonflushing_analyze_debug.result b/mysql-test/main/percona_nonflushing_analyze_debug.result index 06ea4140626..78da085f26f 100644 --- a/mysql-test/main/percona_nonflushing_analyze_debug.result +++ b/mysql-test/main/percona_nonflushing_analyze_debug.result @@ -5,10 +5,12 @@ SET DEBUG_SYNC="handler_ha_index_next_end SIGNAL idx_scan_in_progress WAIT_FOR f SELECT * FROM t1; connection default; SET DEBUG_SYNC="now WAIT_FOR idx_scan_in_progress"; +set @tmp=@@use_stat_tables; +set use_stat_tables='preferably_for_queries'; ANALYZE TABLE t1; Table Op Msg_type Msg_text -test.t1 analyze status Engine-independent statistics collected test.t1 analyze status OK +set use_stat_tables=@tmp; SELECT * FROM t1; a 1 diff --git a/mysql-test/suite/parts/r/percona_nonflushing_analyze_debug.result b/mysql-test/suite/parts/r/percona_nonflushing_analyze_debug.result index 2e5f5170259..070d5e8d79f 100644 --- a/mysql-test/suite/parts/r/percona_nonflushing_analyze_debug.result +++ b/mysql-test/suite/parts/r/percona_nonflushing_analyze_debug.result @@ -8,10 +8,12 @@ SET DEBUG_SYNC="handler_ha_index_next_end SIGNAL idx_scan_in_progress WAIT_FOR f SELECT * FROM t1; connection default; SET DEBUG_SYNC="now WAIT_FOR idx_scan_in_progress"; +set @tmp=@@use_stat_tables; +set use_stat_tables='preferably_for_queries'; ANALYZE TABLE t1; Table Op Msg_type Msg_text -test.t1 analyze status Engine-independent statistics collected test.t1 analyze status OK +set use_stat_tables=@tmp; SELECT * FROM t1; a 1 @@ -41,10 +43,12 @@ SET DEBUG_SYNC="handler_ha_index_next_end SIGNAL idx_scan_in_progress WAIT_FOR f SELECT * FROM t2; connection default; SET DEBUG_SYNC="now WAIT_FOR idx_scan_in_progress"; +set @tmp=@@use_stat_tables; +set use_stat_tables='preferably_for_queries'; ANALYZE TABLE t2; Table Op Msg_type Msg_text -test.t2 analyze status Engine-independent statistics collected test.t2 analyze status OK +set use_stat_tables=@tmp; SELECT * FROM t2; a 1