diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-07-19 09:48:17 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-07-19 09:48:17 +0300 |
| commit | 4aa97ba5944f4afe751525e68b77100b1aa51524 (patch) | |
| tree | c70a40b1fe9b5bf60668a35aa0d85872298a91fb | |
| parent | 864f0005f9370aadc361e767df335a8c9d814c78 (diff) | |
| download | mariadb-git-4aa97ba5944f4afe751525e68b77100b1aa51524.tar.gz | |
Fix innodb-system-table-view for --embedded
| -rw-r--r-- | mysql-test/suite/innodb/include/show_i_s_tablespaces.inc | 2 | ||||
| -rw-r--r-- | mysql-test/suite/innodb/t/innodb-system-table-view.test | 3 |
2 files changed, 1 insertions, 4 deletions
diff --git a/mysql-test/suite/innodb/include/show_i_s_tablespaces.inc b/mysql-test/suite/innodb/include/show_i_s_tablespaces.inc index c6a4dfc4366..a3755f8657a 100644 --- a/mysql-test/suite/innodb/include/show_i_s_tablespaces.inc +++ b/mysql-test/suite/innodb/include/show_i_s_tablespaces.inc @@ -4,7 +4,7 @@ --echo === information_schema.innodb_sys_tablespaces and innodb_sys_datafiles === --disable_query_log --replace_regex /#P#/#p#/ /#SP#/#sp#/ ---replace_result ./ MYSQLD_DATADIR/ $MYSQLD_DATADIR/ MYSQLD_DATADIR/ $MYSQLD_DATADIR MYSQLD_DATADIR/ $MYSQL_TMP_DIR MYSQL_TMP_DIR $INNODB_PAGE_SIZE DEFAULT +--replace_result ./ MYSQLD_DATADIR/ $MYSQLD_DATADIR MYSQLD_DATADIR $MYSQL_TMP_DIR MYSQL_TMP_DIR $INNODB_PAGE_SIZE DEFAULT SELECT s.name 'Space_Name', s.page_size 'Page_Size', s.zip_page_size 'Zip_Size', 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 |