Skip to content

Commit cd1a195

Browse files
MDEV-25947 innodb_fts.misc_debug fails in buildbot
- Make innodb_fts.misc_debug test case more stable.
1 parent 35b57c3 commit cd1a195

File tree

2 files changed

+8
-14
lines changed

2 files changed

+8
-14
lines changed

mysql-test/suite/innodb_fts/r/misc_debug.result

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,19 +31,17 @@ DROP TABLE t2, t1;
3131
#
3232
CREATE TABLE t1(a INT, b TEXT, c TEXT, FULLTEXT INDEX(b)) ENGINE=InnoDB;
3333
connect con1,localhost,root,,test;
34-
SET DEBUG_SYNC='innodb_inplace_alter_table_enter SIGNAL s1 WAIT_FOR g1';
34+
SET DEBUG_DBUG="+d,innodb_OOM_inplace_alter";
3535
SET DEBUG_SYNC='innodb_commit_inplace_alter_table_enter SIGNAL s2 WAIT_FOR g2';
3636
ALTER TABLE t1 ADD FULLTEXT(c);
3737
connection default;
38-
SET DEBUG_SYNC='now WAIT_FOR s1';
39-
KILL QUERY @id;
40-
SET DEBUG_SYNC='now SIGNAL g1 WAIT_FOR s2';
38+
SET DEBUG_SYNC='now WAIT_FOR s2';
4139
START TRANSACTION;
4240
SELECT * FROM t1;
4341
a b c
44-
SET DEBUG_SYNC='now SIGNAL s2';
42+
SET DEBUG_SYNC='now SIGNAL g2';
4543
connection con1;
46-
ERROR 70100: Query execution was interrupted
44+
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
4745
disconnect con1;
4846
connection default;
4947
SET DEBUG_SYNC=RESET;

mysql-test/suite/innodb_fts/t/misc_debug.test

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -60,20 +60,16 @@ DROP TABLE t2, t1;
6060
--echo #
6161
CREATE TABLE t1(a INT, b TEXT, c TEXT, FULLTEXT INDEX(b)) ENGINE=InnoDB;
6262
connect(con1,localhost,root,,test);
63-
let $ID= `SELECT @id := CONNECTION_ID()`;
64-
SET DEBUG_SYNC='innodb_inplace_alter_table_enter SIGNAL s1 WAIT_FOR g1';
63+
SET DEBUG_DBUG="+d,innodb_OOM_inplace_alter";
6564
SET DEBUG_SYNC='innodb_commit_inplace_alter_table_enter SIGNAL s2 WAIT_FOR g2';
6665
send ALTER TABLE t1 ADD FULLTEXT(c);
6766
connection default;
68-
SET DEBUG_SYNC='now WAIT_FOR s1';
69-
let $ignore= `SELECT @id := $ID`;
70-
KILL QUERY @id;
71-
SET DEBUG_SYNC='now SIGNAL g1 WAIT_FOR s2';
67+
SET DEBUG_SYNC='now WAIT_FOR s2';
7268
START TRANSACTION;
7369
SELECT * FROM t1;
74-
SET DEBUG_SYNC='now SIGNAL s2';
70+
SET DEBUG_SYNC='now SIGNAL g2';
7571
connection con1;
76-
--error ER_QUERY_INTERRUPTED
72+
--error ER_OUT_OF_RESOURCES
7773
reap;
7874
disconnect con1;
7975
connection default;

0 commit comments

Comments
 (0)