From 71e10ba3bbda3f969df9c2918c3c1598c940638c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marko=20M=C3=A4kel=C3=A4?= Date: Thu, 25 Nov 2021 14:03:20 +0200 Subject: Make innodb.innodb-table-online more stable Occasionally, the test would fail with a result difference for ddl_log_file_alter_table (0 instead of 1) due to some nondeterminism in the test. Let us remove that nondeterminism. --- mysql-test/suite/innodb/r/innodb-table-online.result | 2 +- mysql-test/suite/innodb/t/innodb-table-online.test | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/mysql-test/suite/innodb/r/innodb-table-online.result b/mysql-test/suite/innodb/r/innodb-table-online.result index 9ef5316e17d..91d9b355125 100644 --- a/mysql-test/suite/innodb/r/innodb-table-online.result +++ b/mysql-test/suite/innodb/r/innodb-table-online.result @@ -202,10 +202,10 @@ SET lock_wait_timeout = 10; ALTER TABLE t1 ROW_FORMAT=COMPACT PAGE_COMPRESSED = YES PAGE_COMPRESSION_LEVEL = 1, ALGORITHM = INPLACE; connection default; +SET DEBUG_SYNC = 'now WAIT_FOR rebuilt2'; INSERT INTO t1 SELECT 80 + c1, c2, c3 FROM t1; INSERT INTO t1 SELECT 160 + c1, c2, c3 FROM t1; UPDATE t1 SET c2 = c2 + 1; -SET DEBUG_SYNC = 'now WAIT_FOR rebuilt2'; SELECT name, count FROM INFORMATION_SCHEMA.INNODB_METRICS WHERE subsystem = 'ddl'; name count ddl_background_drop_indexes 0 diff --git a/mysql-test/suite/innodb/t/innodb-table-online.test b/mysql-test/suite/innodb/t/innodb-table-online.test index 978af891157..7ed87fcc26b 100644 --- a/mysql-test/suite/innodb/t/innodb-table-online.test +++ b/mysql-test/suite/innodb/t/innodb-table-online.test @@ -195,13 +195,12 @@ ALTER TABLE t1 ROW_FORMAT=COMPACT PAGE_COMPRESSED = YES PAGE_COMPRESSION_LEVEL = 1, ALGORITHM = INPLACE; # Generate some log (delete-mark, delete-unmark, insert etc.) -# while the index creation is blocked. Some of this may run -# in parallel with the clustered index scan. +# while the index creation is blocked. connection default; +SET DEBUG_SYNC = 'now WAIT_FOR rebuilt2'; INSERT INTO t1 SELECT 80 + c1, c2, c3 FROM t1; INSERT INTO t1 SELECT 160 + c1, c2, c3 FROM t1; UPDATE t1 SET c2 = c2 + 1; -SET DEBUG_SYNC = 'now WAIT_FOR rebuilt2'; # At this point, the clustered index scan must have completed, # but the modification log keeps accumulating due to the DEBUG_SYNC. eval $innodb_metrics_select; -- cgit v1.2.1 From d2bbeeef6f52f2f16b2361e6097c484be2435e38 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marko=20M=C3=A4kel=C3=A4?= Date: Thu, 25 Nov 2021 15:54:19 +0200 Subject: galera.galera_unicode_pk: Avoid MDL wait timeout --- mysql-test/suite/galera/t/galera_unicode_pk.test | 1 + 1 file changed, 1 insertion(+) diff --git a/mysql-test/suite/galera/t/galera_unicode_pk.test b/mysql-test/suite/galera/t/galera_unicode_pk.test index 0d571f5cfd7..cc1ec7e3e3e 100644 --- a/mysql-test/suite/galera/t/galera_unicode_pk.test +++ b/mysql-test/suite/galera/t/galera_unicode_pk.test @@ -12,6 +12,7 @@ CREATE TABLE t1 ( INSERT INTO t1 VALUES ('текст'); --connection node_2 +--source include/wait_until_ready.inc SELECT f1 = 'текст' FROM t1; # -- cgit v1.2.1 From e8f6b3b20ed0fb79d6db62ad6752560b2537049e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marko=20M=C3=A4kel=C3=A4?= Date: Thu, 25 Nov 2021 18:50:29 +0200 Subject: Restore a DBUG_SUICIDE for binlog.binlog_truncate_multi_engine This fixes up 4489a89c71ea78f2562159ca0303fbb83da5baa0 and the test binlog.binlog_truncate_multi_engine that indirectly invokes the DBUG_SUICIDE. --- storage/innobase/log/log0log.cc | 1 + 1 file changed, 1 insertion(+) diff --git a/storage/innobase/log/log0log.cc b/storage/innobase/log/log0log.cc index 1ff603a90a1..37199bee616 100644 --- a/storage/innobase/log/log0log.cc +++ b/storage/innobase/log/log0log.cc @@ -836,6 +836,7 @@ repeat: ret_lsn2= flush_lock.release(flush_lsn); log_flush_notify(flush_lsn); + DBUG_EXECUTE_IF("crash_after_log_write_upto", DBUG_SUICIDE();); } if (ret_lsn1 || ret_lsn2) -- cgit v1.2.1