Fixed random failure main/truncate_notembedded

Backport from 10.6
MariaDB · Jan 27, 2022 · 2f5d6ef · 2f5d6ef
1 parent 20a91b8
commit 2f5d6ef
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/mysql-test/main/truncate_notembedded.result b/mysql-test/main/truncate_notembedded.result
@@ -13,7 +13,6 @@ a
 UNLOCK TABLES;
 connection con1;
 TRUNCATE TABLE t1;
-ERROR HY000: The MariaDB server is running with the --max-thread-mem-used=45500 option so it cannot execute this statement
 disconnect con1;
 connection default;
 DROP TABLE t1;

diff --git a/mysql-test/main/truncate_notembedded.test b/mysql-test/main/truncate_notembedded.test
@@ -18,8 +18,12 @@ SELECT * FROM t1;
 UNLOCK TABLES;
 
 --connection con1
+--error 0,ER_OPTION_PREVENTS_STATEMENT
 --reap
---error ER_OPTION_PREVENTS_STATEMENT
+# This may work or fail as different servers uses different amount of
+# memory and the statement may work or not. What is important is that we
+# don't get a crash here!
+--error 0,ER_OPTION_PREVENTS_STATEMENT
 TRUNCATE TABLE t1;
 
 --disconnect con1