database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-12-24 11:21:21 +03:00
Code Activity

Merge 10.5 into 10.6

Browse Source
This commit is contained in:
Marko Mäkelä
2023-01-03 18:13:11 +02:00
parent fce80b6ae1 8b9b4ab3f5
commit e441c32a0b
178 changed files with 2956 additions and 2254 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
mysql-test/suite/innodb_fts/t/misc_debug.test
View File

@@ -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