diff options
author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-07-19 11:45:55 +0300 |
---|---|---|
committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-07-19 11:45:55 +0300 |
commit | d9dcb8ba029709cf447efd9237f6ad4834f0783a (patch) | |
tree | fd7c03d5b09ed8eb26de27be772bf33dc2435cd1 /mysql-test | |
parent | 059968dc5dbe834a9c7119b282d7c63a1261b44f (diff) | |
parent | 4aa97ba5944f4afe751525e68b77100b1aa51524 (diff) | |
download | mariadb-git-d9dcb8ba029709cf447efd9237f6ad4834f0783a.tar.gz |
Merge 10.1 into 10.2
Diffstat (limited to 'mysql-test')
-rw-r--r-- | mysql-test/suite/innodb/t/innodb-system-table-view.test | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/mysql-test/suite/innodb/t/innodb-system-table-view.test b/mysql-test/suite/innodb/t/innodb-system-table-view.test index e72781d2218..087c0a22eca 100644 --- a/mysql-test/suite/innodb/t/innodb-system-table-view.test +++ b/mysql-test/suite/innodb/t/innodb-system-table-view.test @@ -4,11 +4,8 @@ --source include/innodb_page_size_small.inc ---disable_query_log -SET default_storage_engine=InnoDB; LET $MYSQLD_DATADIR = `select @@datadir`; LET $INNODB_PAGE_SIZE = `select @@innodb_page_size`; ---enable_query_log # The IDs of mysql.innodb_table_stats and mysql.innodb_index_stats may # vary depending on whether the tables have been rebuilt |