diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-03-17 13:23:06 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-03-17 13:23:06 +0200 |
| commit | 124b72cb830fb85505eb46cfb19f639917c285f2 (patch) | |
| tree | 37a8cf10d5822415fb8194897012fd800d1207e6 /mysql-test/main | |
| parent | c236f69d95321663c597a06f6e4e7ec440443ea5 (diff) | |
| parent | dfa6fba9595ae7fd5cb312d8c35aa6930a955d9f (diff) | |
| download | mariadb-git-124b72cb830fb85505eb46cfb19f639917c285f2.tar.gz | |
Merge 10.5 into 10.6
Diffstat (limited to 'mysql-test/main')
| -rw-r--r-- | mysql-test/main/mysqld--help.test | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/mysql-test/main/mysqld--help.test b/mysql-test/main/mysqld--help.test index f32f52c6dd0..f7eb038a6f3 100644 --- a/mysql-test/main/mysqld--help.test +++ b/mysql-test/main/mysqld--help.test @@ -2,6 +2,7 @@ # mysqld --help # --source include/not_embedded.inc +--source include/not_asan.inc --source include/have_perfschema.inc --source include/have_profiling.inc --source include/platform.inc |