diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-03-31 12:04:50 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-03-31 12:04:50 +0300 |
| commit | 176aaf93d1e7c256bb413931c5baa361b856a7de (patch) | |
| tree | 7d5505ee40a11d6778208ca5976eba73ff489a06 /mysql-test/main/mysql_upgrade-6984.test | |
| parent | eb2d36296eb2f2f653ea69e78d7a471ee935d2a4 (diff) | |
| parent | 5eae8c274244aaa98320dda3e686f264e8a447d6 (diff) | |
| download | mariadb-git-176aaf93d1e7c256bb413931c5baa361b856a7de.tar.gz | |
Merge 10.5 into 10.6
Diffstat (limited to 'mysql-test/main/mysql_upgrade-6984.test')
| -rw-r--r-- | mysql-test/main/mysql_upgrade-6984.test | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/mysql-test/main/mysql_upgrade-6984.test b/mysql-test/main/mysql_upgrade-6984.test index 01bdc15c64b..4c5c44493e2 100644 --- a/mysql-test/main/mysql_upgrade-6984.test +++ b/mysql-test/main/mysql_upgrade-6984.test @@ -2,6 +2,7 @@ # MDEV-6984 Can't migrate from MySQL 5.6.21 to MariaDB 10 # --source include/not_embedded.inc +--source include/have_perfschema.inc # # When 'root' account is password protected and MYSQL_UPGRADE doesn't |