mirror of
https://github.com/MariaDB/server.git
synced 2025-01-16 03:52:35 +01:00
MDEV-25947 innodb_fts.misc_debug fails in buildbot
- Make innodb_fts.misc_debug test case more stable.
This commit is contained in:
parent
35b57c37bb
commit
cd1a195b22
2 changed files with 8 additions and 14 deletions
|
@ -31,19 +31,17 @@ DROP TABLE t2, t1;
|
|||
#
|
||||
CREATE TABLE t1(a INT, b TEXT, c TEXT, FULLTEXT INDEX(b)) ENGINE=InnoDB;
|
||||
connect con1,localhost,root,,test;
|
||||
SET DEBUG_SYNC='innodb_inplace_alter_table_enter SIGNAL s1 WAIT_FOR g1';
|
||||
SET DEBUG_DBUG="+d,innodb_OOM_inplace_alter";
|
||||
SET DEBUG_SYNC='innodb_commit_inplace_alter_table_enter SIGNAL s2 WAIT_FOR g2';
|
||||
ALTER TABLE t1 ADD FULLTEXT(c);
|
||||
connection default;
|
||||
SET DEBUG_SYNC='now WAIT_FOR s1';
|
||||
KILL QUERY @id;
|
||||
SET DEBUG_SYNC='now SIGNAL g1 WAIT_FOR s2';
|
||||
SET DEBUG_SYNC='now WAIT_FOR s2';
|
||||
START TRANSACTION;
|
||||
SELECT * FROM t1;
|
||||
a b c
|
||||
SET DEBUG_SYNC='now SIGNAL s2';
|
||||
SET DEBUG_SYNC='now SIGNAL g2';
|
||||
connection con1;
|
||||
ERROR 70100: Query execution was interrupted
|
||||
ERROR HY000: Out of memory; check if mysqld or some other process uses all available memory; if not, you may have to use 'ulimit' to allow mysqld to use more memory or you can add more swap space
|
||||
disconnect con1;
|
||||
connection default;
|
||||
SET DEBUG_SYNC=RESET;
|
||||
|
|
|
@ -60,20 +60,16 @@ DROP TABLE t2, t1;
|
|||
--echo #
|
||||
CREATE TABLE t1(a INT, b TEXT, c TEXT, FULLTEXT INDEX(b)) ENGINE=InnoDB;
|
||||
connect(con1,localhost,root,,test);
|
||||
let $ID= `SELECT @id := CONNECTION_ID()`;
|
||||
SET DEBUG_SYNC='innodb_inplace_alter_table_enter SIGNAL s1 WAIT_FOR g1';
|
||||
SET DEBUG_DBUG="+d,innodb_OOM_inplace_alter";
|
||||
SET DEBUG_SYNC='innodb_commit_inplace_alter_table_enter SIGNAL s2 WAIT_FOR g2';
|
||||
send ALTER TABLE t1 ADD FULLTEXT(c);
|
||||
connection default;
|
||||
SET DEBUG_SYNC='now WAIT_FOR s1';
|
||||
let $ignore= `SELECT @id := $ID`;
|
||||
KILL QUERY @id;
|
||||
SET DEBUG_SYNC='now SIGNAL g1 WAIT_FOR s2';
|
||||
SET DEBUG_SYNC='now WAIT_FOR s2';
|
||||
START TRANSACTION;
|
||||
SELECT * FROM t1;
|
||||
SET DEBUG_SYNC='now SIGNAL s2';
|
||||
SET DEBUG_SYNC='now SIGNAL g2';
|
||||
connection con1;
|
||||
--error ER_QUERY_INTERRUPTED
|
||||
--error ER_OUT_OF_RESOURCES
|
||||
reap;
|
||||
disconnect con1;
|
||||
connection default;
|
||||
|
|
Loading…
Reference in a new issue