diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-02-05 08:32:57 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-02-05 08:32:57 +0200 |
| commit | c42ee8a7cf1b1b571f89904f55722e817c9b54fe (patch) | |
| tree | 4f06c460b380972258d07ebbd0417f00c7910761 | |
| parent | 597510adfcbf0b977d0cc9bd216b91d319152e6b (diff) | |
| download | mariadb-git-c42ee8a7cf1b1b571f89904f55722e817c9b54fe.tar.gz | |
MDEV-24781 fixup: Adjust innodb.innodb-index-debug
Now that an INSERT into an empty table is replicated more efficiently
during online ALTER, an old test case started to fail. Let us disable
the MDEV-515 logic for the critical INSERT statement.
| -rw-r--r-- | mysql-test/suite/innodb/r/innodb-index-debug.result | 2 | ||||
| -rw-r--r-- | mysql-test/suite/innodb/t/innodb-index-debug.test | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/mysql-test/suite/innodb/r/innodb-index-debug.result b/mysql-test/suite/innodb/r/innodb-index-debug.result index daef31d2caa..8a1091266a9 100644 --- a/mysql-test/suite/innodb/r/innodb-index-debug.result +++ b/mysql-test/suite/innodb/r/innodb-index-debug.result @@ -122,9 +122,11 @@ SET DEBUG_SYNC='row_log_table_apply1_before SIGNAL built WAIT_FOR log'; ALTER TABLE t1 DROP j, FORCE; connection default; SET DEBUG_SYNC='now WAIT_FOR built'; +SET DEBUG_DBUG='+d,row_ins_row_level'; INSERT INTO t1 (i) VALUES (0),(0); ERROR 23000: Duplicate entry '0' for key 'i' SET DEBUG_SYNC='now SIGNAL log'; +SET DEBUG_DBUG=@saved_debug_dbug; connection con1; ERROR 23000: Duplicate entry '0' for key 'i' SET DEBUG_SYNC='row_log_table_apply1_before SIGNAL built2 WAIT_FOR log2'; diff --git a/mysql-test/suite/innodb/t/innodb-index-debug.test b/mysql-test/suite/innodb/t/innodb-index-debug.test index 2988a89c651..9083dc80720 100644 --- a/mysql-test/suite/innodb/t/innodb-index-debug.test +++ b/mysql-test/suite/innodb/t/innodb-index-debug.test @@ -129,9 +129,11 @@ ALTER TABLE t1 DROP j, FORCE; --connection default SET DEBUG_SYNC='now WAIT_FOR built'; +SET DEBUG_DBUG='+d,row_ins_row_level'; --error ER_DUP_ENTRY INSERT INTO t1 (i) VALUES (0),(0); SET DEBUG_SYNC='now SIGNAL log'; +SET DEBUG_DBUG=@saved_debug_dbug; --connection con1 --error ER_DUP_ENTRY |