diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-08-13 18:57:00 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-08-13 18:57:00 +0300 |
| commit | 624dd71b9419555eca8baadc695e3376de72286f (patch) | |
| tree | 31aaab8aeac43f921638407ab82190dd05a72793 /mysql-test/suite/innodb/include | |
| parent | d4d865fcc8083782b6e4419c69bec372cd0b4142 (diff) | |
| parent | e9c1701e11e2441435223cc7c00c467f58aaff19 (diff) | |
| download | mariadb-git-624dd71b9419555eca8baadc695e3376de72286f.tar.gz | |
Merge 10.4 into 10.5
Diffstat (limited to 'mysql-test/suite/innodb/include')
| -rw-r--r-- | mysql-test/suite/innodb/include/show_i_s_tablespaces.inc | 2 |
1 files changed, 0 insertions, 2 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..32c5e88d9b6 100644 --- a/mysql-test/suite/innodb/include/show_i_s_tablespaces.inc +++ b/mysql-test/suite/innodb/include/show_i_s_tablespaces.inc @@ -8,12 +8,10 @@ SELECT s.name 'Space_Name', s.page_size 'Page_Size', s.zip_page_size 'Zip_Size', - s.row_format 'Formats_Permitted', d.path 'Path' FROM information_schema.innodb_sys_tablespaces s, information_schema.innodb_sys_datafiles d WHERE s.space = d.space AND s.name NOT LIKE 'mysql/%' - AND s.name NOT LIKE 'sys/%' ORDER BY s.space; --enable_query_log |