diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-11-25 19:52:52 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-11-25 19:52:52 +0200 |
| commit | 124d74f5eb7101d2e61ce371d385bc302fac131c (patch) | |
| tree | 331f0e519e7d2e21dc4293ada2ca5666a135021a | |
| parent | c41cbfaf1ac17e6e36ea78fe2991d86d1f188465 (diff) | |
| parent | ac3b33d2364542e102d3e1997be54a8caeedfab7 (diff) | |
| download | mariadb-git-124d74f5eb7101d2e61ce371d385bc302fac131c.tar.gz | |
Merge 10.7 into 10.8
| -rw-r--r-- | mysql-test/suite/galera/t/galera_unicode_pk.test | 1 | ||||
| -rw-r--r-- | mysql-test/suite/innodb/r/innodb-table-online.result | 2 | ||||
| -rw-r--r-- | mysql-test/suite/innodb/t/innodb-table-online.test | 5 | ||||
| -rw-r--r-- | storage/innobase/log/log0log.cc | 1 |
4 files changed, 5 insertions, 4 deletions
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; # 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 bd87e2697b4..86d9cfdb2b4 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; 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) |