diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2022-10-05 20:30:57 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2022-10-05 20:30:57 +0300 |
| commit | 65d0c57c1a2036c8a8c065d3e3bd4f85d0cc5d57 (patch) | |
| tree | 9165f331634b0725bcf628390fcfd8a3381f7147 /mysql-test/main | |
| parent | df97eb1432f91ad13e562111bda393b3650719d0 (diff) | |
| parent | c0eda62aec1de8b74ca51791df5ad142dee2ef08 (diff) | |
| download | mariadb-git-65d0c57c1a2036c8a8c065d3e3bd4f85d0cc5d57.tar.gz | |
Merge 10.3 into 10.4
Diffstat (limited to 'mysql-test/main')
| -rw-r--r-- | mysql-test/main/log_slow.test | 2 | ||||
| -rw-r--r-- | mysql-test/main/plugin_auth.test | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/mysql-test/main/log_slow.test b/mysql-test/main/log_slow.test index 64fd8202985..b51777d859e 100644 --- a/mysql-test/main/log_slow.test +++ b/mysql-test/main/log_slow.test @@ -1,3 +1,5 @@ +--source include/no_valgrind_without_big.inc + # # Testing of slow log query options # diff --git a/mysql-test/main/plugin_auth.test b/mysql-test/main/plugin_auth.test index 30e4fa6e0ad..6912462066c 100644 --- a/mysql-test/main/plugin_auth.test +++ b/mysql-test/main/plugin_auth.test @@ -2,6 +2,7 @@ --source include/not_embedded.inc --source include/mysql_upgrade_preparation.inc --source include/have_innodb.inc +--source include/no_valgrind_without_big.inc SET GLOBAL SQL_MODE=""; SET LOCAL SQL_MODE=""; |