summaryrefslogtreecommitdiff
path: root/mysql-test/suite/innodb
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2020-03-19 17:30:26 +0200
committerMarko Mäkelä <marko.makela@mariadb.com>2020-03-19 17:30:26 +0200
commit601807bfbde573254258e5d3e31dde1ac0601fd7 (patch)
tree7bb49f334406a9d254b94490a78d6c725d1d1477 /mysql-test/suite/innodb
parent6297a1026db4032ab7b7e28788d0b5b9a1f32aa3 (diff)
downloadmariadb-git-10.5-MDEV-15053.tar.gz
WIP (crashes/hangs!) MDEV-15053 Reduce buf_pool_t::mutex contention10.5-MDEV-15053
TODO: Carefully review and document the changed latching rules, make ASAN happy, and possibly make more use of std::atomic and make more things private in buf_pool_t to control access.
Diffstat (limited to 'mysql-test/suite/innodb')
-rw-r--r--mysql-test/suite/innodb/t/innodb-change-buffer-recovery.test2
-rw-r--r--mysql-test/suite/innodb/t/innodb_bug14147491.test1
2 files changed, 2 insertions, 1 deletions
diff --git a/mysql-test/suite/innodb/t/innodb-change-buffer-recovery.test b/mysql-test/suite/innodb/t/innodb-change-buffer-recovery.test
index 9c5acedb620..46aa6df2ee6 100644
--- a/mysql-test/suite/innodb/t/innodb-change-buffer-recovery.test
+++ b/mysql-test/suite/innodb/t/innodb-change-buffer-recovery.test
@@ -56,7 +56,7 @@ DELETE FROM t1 WHERE a=1;
# This should be buffered, if innodb_change_buffering_debug = 1 is in effect.
INSERT INTO t1 VALUES(1,'X',1);
-SET DEBUG_DBUG='+d,crash_after_log_ibuf_upd_inplace';
+SET GLOBAL DEBUG_DBUG='+d,crash_after_log_ibuf_upd_inplace';
--exec echo "wait" > $_expect_file_name
--error 2013
# This should force a change buffer merge
diff --git a/mysql-test/suite/innodb/t/innodb_bug14147491.test b/mysql-test/suite/innodb/t/innodb_bug14147491.test
index 44b9d16ca78..b1822015a32 100644
--- a/mysql-test/suite/innodb/t/innodb_bug14147491.test
+++ b/mysql-test/suite/innodb/t/innodb_bug14147491.test
@@ -11,6 +11,7 @@
call mtr.add_suppression("InnoDB: Table `test`\\.`t1` is corrupted\\. Please drop the table and recreate\\.");
call mtr.add_suppression("InnoDB: Database page corruption on disk or a failed file read of tablespace test/t1 page");
call mtr.add_suppression("InnoDB: We detected index corruption in an InnoDB type table");
+call mtr.add_suppression("InnoDB: Failed to read file '.*test.t1\\.ibd' at offset 4: Page read from tablespace is corrupted");
call mtr.add_suppression("Index for table 't1' is corrupt; try to repair it");
--enable_query_log