diff options
| author | Monty <monty@mariadb.org> | 2021-09-21 15:03:04 +0300 |
|---|---|---|
| committer | Monty <monty@mariadb.org> | 2021-09-21 15:06:22 +0300 |
| commit | f2021b5ee4ef8c53bedbab309bad2feda4c73f46 (patch) | |
| tree | 9b1626d9e40011f8cfd0735667208b0b14c33ff5 | |
| parent | d6bddfca229c702fba94b5ed5a864d7df130ca3a (diff) | |
| download | mariadb-git-f2021b5ee4ef8c53bedbab309bad2feda4c73f46.tar.gz | |
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)
| -rw-r--r-- | mysql-test/main/truncate_notembedded.result | 1 | ||||
| -rw-r--r-- | mysql-test/main/truncate_notembedded.test | 5 |
2 files changed, 4 insertions, 2 deletions
diff --git a/mysql-test/main/truncate_notembedded.result b/mysql-test/main/truncate_notembedded.result index 18a01c684e7..6280a995149 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=65536 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 7e186c8f7d5..029701b1e26 100644 --- a/mysql-test/main/truncate_notembedded.test +++ b/mysql-test/main/truncate_notembedded.test @@ -19,7 +19,10 @@ UNLOCK TABLES; --connection con1 --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 |