database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

Fix innodb-system-table-view for --embedded

Browse Source
This commit is contained in:
Marko Mäkelä
2019-07-19 09:48:17 +03:00
parent 864f0005f9
commit 4aa97ba594
2 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/suite/innodb/include/show_i_s_tablespaces.inc
View File

@@ -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',

3
mysql-test/suite/innodb/t/innodb-system-table-view.test
View File

@@ -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