database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-07 00:04:31 +03:00
Code Activity

Merge 10.5 into 10.6

Browse Source
This commit is contained in:
Marko Mäkelä
2022-10-12 12:14:13 +03:00
parent 15edd69ddf 977c385df3
commit a992c615a6
55 changed files with 3153 additions and 358 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -87,6 +87,7 @@ DROP TABLE t1;
--echo #
call mtr.add_suppression("InnoDB: \\(Too many concurrent transactions\\)");
call mtr.add_suppression("InnoDB: Cannot save table statistics for table `test`\\.`t1`: Too many concurrent transactions");
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';
@@ -102,7 +103,7 @@ CREATE TABLE t1(f1 INT NOT NULL, f2 CHAR(100))ENGINE=InnoDB;
SET DEBUG_DBUG="+d,stats_lock_fail";
--error ER_GET_ERRNO
ALTER TABLE t1 ADD FULLTEXT(f2);
SET DEBUG_DBUG="-d,stats_lock_fail";
SET debug_dbug=@saved_debug_dbug;
ALTER TABLE t1 DISCARD TABLESPACE;
--error ER_TABLESPACE_DISCARDED
ALTER TABLE t1 ADD FULLTEXT(f2);