diff options
| author | Monty <monty@mariadb.org> | 2022-01-27 17:00:52 +0200 |
|---|---|---|
| committer | Monty <monty@mariadb.org> | 2022-01-27 17:00:52 +0200 |
| commit | 2f5d6ef039825434c46ceb63f2fd4147859c1fe6 (patch) | |
| tree | b8b69320ef423f686c6887cc117932851e7d1f6e | |
| parent | 20a91b8fc5b336bcc1533c5db5dfa37d6f6ed697 (diff) | |
| download | mariadb-git-2f5d6ef039825434c46ceb63f2fd4147859c1fe6.tar.gz | |
Fixed random failure main/truncate_notembedded
Backport from 10.6
| -rw-r--r-- | mysql-test/main/truncate_notembedded.result | 1 | ||||
| -rw-r--r-- | mysql-test/main/truncate_notembedded.test | 6 |
2 files changed, 5 insertions, 2 deletions
diff --git a/mysql-test/main/truncate_notembedded.result b/mysql-test/main/truncate_notembedded.result index dabd5474141..67beb79707c 100644 --- 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 index 3addad2d975..8b6d2becfa9 100644 --- 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 |