diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-11-25 18:51:12 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-11-25 18:51:12 +0200 |
| commit | ac3b33d2364542e102d3e1997be54a8caeedfab7 (patch) | |
| tree | 7c32cd6e6e392c1302ad8078c0731c5ded3342c4 /mysql-test/suite/innodb | |
| parent | e8f6b3b20ed0fb79d6db62ad6752560b2537049e (diff) | |
| parent | d2bbeeef6f52f2f16b2361e6097c484be2435e38 (diff) | |
| download | mariadb-git-ac3b33d2364542e102d3e1997be54a8caeedfab7.tar.gz | |
Merge 10.6 into 10.7
Diffstat (limited to 'mysql-test/suite/innodb')
| -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 |
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 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; |