summaryrefslogtreecommitdiff
path: root/mysql-test/t/merge.test
diff options
context:
space:
mode:
authorMonty <monty@mariadb.org>2018-02-10 14:42:59 +0200
committerMonty <monty@mariadb.org>2018-02-10 14:42:59 +0200
commita610badb5daf33cffd7a85822d2712eb0beee7b6 (patch)
tree1cd5819fd1eaf69adcd2ee9669ce304214b945cb /mysql-test/t/merge.test
parenta801ba5ce6bda1c2dee41724307bf59f244dda14 (diff)
downloadmariadb-git-bb-10.2-ext2.tar.gz
Added Max_index_length and Temporary to SHOW TABLE STATUSbb-10.2-ext2
- Max_index_length is supported by MyISAM and Aria tables. - Temporary is a placeholder to signal that a table is a temporary table. For the moment this is always "N", except "Y" for generated information_schema tables and NULL for views. Full temporary table support will be done in another task. (No reason to have to update a lot of result files twice in a row)
Diffstat (limited to 'mysql-test/t/merge.test')
-rw-r--r--mysql-test/t/merge.test4
1 files changed, 1 insertions, 3 deletions
diff --git a/mysql-test/t/merge.test b/mysql-test/t/merge.test
index f5771305dc4..edc4a364ad9 100644
--- a/mysql-test/t/merge.test
+++ b/mysql-test/t/merge.test
@@ -1461,9 +1461,7 @@ DROP TABLE t1, m1;
# and there is incorrect merge table
#
CREATE TABLE tm1 (c1 INT) ENGINE=MRG_MYISAM UNION=(t1) INSERT_METHOD=FIRST;
---replace_column 8 # 9 # 10 # 11 # 12 # 13 # 14 # 15 # 16 # 17 # 19 # 20 #
-SELECT * FROM INFORMATION_SCHEMA.TABLES WHERE
-TABLE_SCHEMA = 'test' and TABLE_NAME='tm1';
+SELECT table_schema, table_name, table_type, engine, version, row_format, table_comment FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_SCHEMA = 'test' and TABLE_NAME='tm1';
DROP TABLE tm1;