summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2020-11-17 13:56:20 +0200
committerMarko Mäkelä <marko.makela@mariadb.com>2020-11-17 13:56:20 +0200
commitf0c990379565748c7faa6a068b992f61d9ceb46c (patch)
tree4dea164afa69442816afc192aff2995de2c07584
parent1ae7809a7c87d914d92ad7e069000358c1fe5bfd (diff)
parenteae9311fa2b15eb8a0698444a27af5b70acfb4b2 (diff)
downloadmariadb-git-f0c990379565748c7faa6a068b992f61d9ceb46c.tar.gz
Merge 10.3 into 10.4
-rw-r--r--mysql-test/suite/maria/repair.test6
1 files changed, 6 insertions, 0 deletions
diff --git a/mysql-test/suite/maria/repair.test b/mysql-test/suite/maria/repair.test
index 9603a949f9b..13165269b76 100644
--- a/mysql-test/suite/maria/repair.test
+++ b/mysql-test/suite/maria/repair.test
@@ -1,3 +1,9 @@
+# We should not run this test with embedded as we are using
+# max_session_mem_used, which causes things to fail/not fail randomly
+# as memory usage is different compared to normal server.
+
+--source include/not_embedded.inc
+
#
# MDEV-11539 test_if_reopen: Assertion `strcmp(share->unique_file_name,filename) || share->last_version' failed upon select from I_S
#