diff options
Diffstat (limited to 'mysql-test/suite/innodb_fts/t/misc_debug.test')
| -rw-r--r-- | mysql-test/suite/innodb_fts/t/misc_debug.test | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/mysql-test/suite/innodb_fts/t/misc_debug.test b/mysql-test/suite/innodb_fts/t/misc_debug.test index 9246d27a704..08581768eec 100644 --- a/mysql-test/suite/innodb_fts/t/misc_debug.test +++ b/mysql-test/suite/innodb_fts/t/misc_debug.test @@ -7,6 +7,7 @@ --source include/have_debug.inc --source include/have_debug_sync.inc --source include/count_sessions.inc +--source include/maybe_versioning.inc # Following test is for Bug 14668777 - ASSERT ON IB_VECTOR_SIZE( # TABLE->FTS->INDEXES, ALTER TABLE @@ -91,7 +92,14 @@ SET @saved_debug_dbug= @@debug_dbug; CREATE TABLE t1 (b CHAR(12), FULLTEXT KEY(b)) engine=InnoDB; SET debug_dbug='+d,ib_create_table_fail_too_many_trx'; +if ($MTR_COMBINATION_ORIG) +{ TRUNCATE t1; +} +if (!$MTR_COMBINATION_ORIG) +{ +--echo TRUNCATE t1; +} SET debug_dbug=@saved_debug_dbug; DROP TABLE t1; --echo # End of 10.3 tests @@ -100,7 +108,7 @@ DROP TABLE t1; CREATE TABLE t1(f1 INT NOT NULL, f2 CHAR(100))ENGINE=InnoDB; SET DEBUG_DBUG="+d,stats_lock_fail"; ---error ER_GET_ERRNO +--error ER_LOCK_WAIT_TIMEOUT ALTER TABLE t1 ADD FULLTEXT(f2); SET debug_dbug=@saved_debug_dbug; ALTER TABLE t1 DISCARD TABLESPACE; |