diff options
| author | Vladislav Vaintroub <wlad@mariadb.com> | 2021-09-05 20:22:39 +0200 |
|---|---|---|
| committer | Vladislav Vaintroub <wlad@mariadb.com> | 2021-09-05 20:22:39 +0200 |
| commit | 12c3d1e1d7eee013f2f2ee75965803822a95d43e (patch) | |
| tree | d1c500b4018cd1d8c45ddb2f0f97231c6a2aa276 /mysql-test/main | |
| parent | ae85835cc7fa88bb80a282106c1e905d85157923 (diff) | |
| download | mariadb-git-12c3d1e1d7eee013f2f2ee75965803822a95d43e.tar.gz | |
Fix Windows warnings and tests for -DPLUGIN_PERFSCHEMA=NO
Diffstat (limited to 'mysql-test/main')
| -rw-r--r-- | mysql-test/main/mysql_install_db_win.result | 6 | ||||
| -rw-r--r-- | mysql-test/main/mysql_upgrade_noengine.test | 1 |
2 files changed, 1 insertions, 6 deletions
diff --git a/mysql-test/main/mysql_install_db_win.result b/mysql-test/main/mysql_install_db_win.result index 936165bd052..2440ff351ea 100644 --- a/mysql-test/main/mysql_install_db_win.result +++ b/mysql-test/main/mysql_install_db_win.result @@ -26,12 +26,6 @@ tmpdir=BASEDIR/temp innodb_data_file_path=ibdata1:10M;ibdata2:10M:autoextend innodb_log_group_home_dir=BASEDIR/data skip-name-resolve - -#********************************************************* -# performance_schema -#********************************************************* -performance_schema=OFF - [client] port=3307 # restart diff --git a/mysql-test/main/mysql_upgrade_noengine.test b/mysql-test/main/mysql_upgrade_noengine.test index 5b063fb3d8c..efe36c355ab 100644 --- a/mysql-test/main/mysql_upgrade_noengine.test +++ b/mysql-test/main/mysql_upgrade_noengine.test @@ -1,6 +1,7 @@ # # MDEV-11942 BLACKHOLE is no longer active in 10.1 by default, mysql_upgrade not handling the situation # +source include/mysql_upgrade_preparation.inc; source include/have_innodb.inc; source include/not_embedded.inc; |