Skip to content

Commit f2021b5

Browse files
committed
Fixed random failure of main.truncate_notembedded
The test depends on how the server allocates memory and may fail randomly. Fixed by accepting that TRUNCATE may work in some cases (happened to me)
1 parent d6bddfc commit f2021b5

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

mysql-test/main/truncate_notembedded.result

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ a
1313
UNLOCK TABLES;
1414
connection con1;
1515
TRUNCATE TABLE t1;
16-
ERROR HY000: The MariaDB server is running with the --max-thread-mem-used=65536 option so it cannot execute this statement
1716
disconnect con1;
1817
connection default;
1918
DROP TABLE t1;

mysql-test/main/truncate_notembedded.test

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,10 @@ UNLOCK TABLES;
1919

2020
--connection con1
2121
--reap
22-
--error ER_OPTION_PREVENTS_STATEMENT
22+
# This may work or fail as different servers uses different amount of
23+
# memory and the statement may work or not. What is important is that we
24+
# don't get a crash here!
25+
--error 0,ER_OPTION_PREVENTS_STATEMENT
2326
TRUNCATE TABLE t1;
2427

2528
--disconnect con1

0 commit comments

Comments
 (0)