Skip to content

Commit fd1755e

Browse files
committed
MDEV-15101: Stop ANALYZE TABLE from flushing table definition cache
Part#2: forgot to commit the adjustments for the testcases.
1 parent 4312000 commit fd1755e

File tree

3 files changed

+12
-3
lines changed

3 files changed

+12
-3
lines changed

mysql-test/include/percona_nonflushing_analyze_debug.inc

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,11 @@ send_eval SELECT * FROM $percona_nonflushing_analyze_table;
1616

1717
SET DEBUG_SYNC="now WAIT_FOR idx_scan_in_progress";
1818

19+
set @tmp=@@use_stat_tables;
20+
set use_stat_tables='preferably_for_queries';
1921
eval ANALYZE TABLE $percona_nonflushing_analyze_table;
2022

23+
set use_stat_tables=@tmp;
2124
# With the bug fixed this should not block
2225
eval SELECT * FROM $percona_nonflushing_analyze_table;
2326

mysql-test/main/percona_nonflushing_analyze_debug.result

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,12 @@ SET DEBUG_SYNC="handler_ha_index_next_end SIGNAL idx_scan_in_progress WAIT_FOR f
55
SELECT * FROM t1;
66
connection default;
77
SET DEBUG_SYNC="now WAIT_FOR idx_scan_in_progress";
8+
set @tmp=@@use_stat_tables;
9+
set use_stat_tables='preferably_for_queries';
810
ANALYZE TABLE t1;
911
Table Op Msg_type Msg_text
10-
test.t1 analyze status Engine-independent statistics collected
1112
test.t1 analyze status OK
13+
set use_stat_tables=@tmp;
1214
SELECT * FROM t1;
1315
a
1416
1

mysql-test/suite/parts/r/percona_nonflushing_analyze_debug.result

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,12 @@ SET DEBUG_SYNC="handler_ha_index_next_end SIGNAL idx_scan_in_progress WAIT_FOR f
88
SELECT * FROM t1;
99
connection default;
1010
SET DEBUG_SYNC="now WAIT_FOR idx_scan_in_progress";
11+
set @tmp=@@use_stat_tables;
12+
set use_stat_tables='preferably_for_queries';
1113
ANALYZE TABLE t1;
1214
Table Op Msg_type Msg_text
13-
test.t1 analyze status Engine-independent statistics collected
1415
test.t1 analyze status OK
16+
set use_stat_tables=@tmp;
1517
SELECT * FROM t1;
1618
a
1719
1
@@ -41,10 +43,12 @@ SET DEBUG_SYNC="handler_ha_index_next_end SIGNAL idx_scan_in_progress WAIT_FOR f
4143
SELECT * FROM t2;
4244
connection default;
4345
SET DEBUG_SYNC="now WAIT_FOR idx_scan_in_progress";
46+
set @tmp=@@use_stat_tables;
47+
set use_stat_tables='preferably_for_queries';
4448
ANALYZE TABLE t2;
4549
Table Op Msg_type Msg_text
46-
test.t2 analyze status Engine-independent statistics collected
4750
test.t2 analyze status OK
51+
set use_stat_tables=@tmp;
4852
SELECT * FROM t2;
4953
a
5054
1

0 commit comments

Comments
 (0)