Skip to content

Commit 72994d6

Browse files
committed
Revert the MDEV-4396 tweak to innodb.innodb_bug14676111.
MDEV-11802 aims to fix the root cause instead.
1 parent 343ba58 commit 72994d6

File tree

3 files changed

+2
-15
lines changed

3 files changed

+2
-15
lines changed

mysql-test/suite/innodb/r/innodb_bug14676111.result

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
1-
drop table if exists t1;
2-
call mtr.add_suppression("option 'innodb-purge-threads': unsigned value 0 adjusted to*");
3-
set global innodb_stats_persistent = false;
4-
CREATE TABLE t1 (a int not null primary key) engine=InnoDB;
1+
CREATE TABLE t1 (a INT PRIMARY KEY) ENGINE=InnoDB STATS_PERSISTENT=0;
52
set global innodb_limit_optimistic_insert_debug = 2;
63
insert into t1 values (1);
74
insert into t1 values (5);

mysql-test/suite/innodb/t/innodb_bug14676111-master.opt

Lines changed: 0 additions & 1 deletion
This file was deleted.

mysql-test/suite/innodb/t/innodb_bug14676111.test

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -10,20 +10,12 @@ if (`select count(*)=0 from information_schema.global_variables where variable_n
1010

1111
--disable_query_log
1212
set @old_innodb_limit_optimistic_insert_debug = @@innodb_limit_optimistic_insert_debug;
13-
set @old_innodb_stats_persistent = @@innodb_stats_persistent;
1413
set @old_innodb_undo_logs = @@innodb_undo_logs;
1514
# Limit undo segments for stable progress of purge.
1615
set global innodb_undo_logs = 1;
1716
--enable_query_log
18-
--disable_warnings
19-
drop table if exists t1;
20-
--enable_warnings
2117

22-
call mtr.add_suppression("option 'innodb-purge-threads': unsigned value 0 adjusted to*");
23-
24-
set global innodb_stats_persistent = false;
25-
26-
CREATE TABLE t1 (a int not null primary key) engine=InnoDB;
18+
CREATE TABLE t1 (a INT PRIMARY KEY) ENGINE=InnoDB STATS_PERSISTENT=0;
2719

2820
#
2921
# make 4 leveled straight tree
@@ -139,6 +131,5 @@ drop table t1;
139131

140132
--disable_query_log
141133
set global innodb_limit_optimistic_insert_debug = @old_innodb_limit_optimistic_insert_debug;
142-
set global innodb_stats_persistent = @old_innodb_stats_persistent;
143134
set global innodb_undo_logs = @old_innodb_undo_logs;
144135
--enable_query_log

0 commit comments

Comments
 (0)