diff options
| author | Daniel Black <danielgb@au.ibm.com> | 2018-02-25 15:25:54 +1100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-25 15:25:54 +1100 |
| commit | 0805a9565f09a36104a420d9e229e44b1eea8879 (patch) | |
| tree | 5c5dbf942479c2b7349f1b4505768ddf5a2f8b8d /mysql-test/suite/innodb/r/innodb_max_recordsize_32k.result | |
| parent | 3188131b15c26509e4df3c4b15972d07a20be8bd (diff) | |
| parent | 8936b175106a3fdfc560e9d33aa58a6372084c5f (diff) | |
| download | mariadb-git-0805a9565f09a36104a420d9e229e44b1eea8879.tar.gz | |
Merge branch '10.3' into 10.2-MDEV-10814-dont-dump-query-cache
Diffstat (limited to 'mysql-test/suite/innodb/r/innodb_max_recordsize_32k.result')
| -rw-r--r-- | mysql-test/suite/innodb/r/innodb_max_recordsize_32k.result | 34 |
1 files changed, 10 insertions, 24 deletions
diff --git a/mysql-test/suite/innodb/r/innodb_max_recordsize_32k.result b/mysql-test/suite/innodb/r/innodb_max_recordsize_32k.result index c2bb0ba0aa8..117b7e4418e 100644 --- a/mysql-test/suite/innodb/r/innodb_max_recordsize_32k.result +++ b/mysql-test/suite/innodb/r/innodb_max_recordsize_32k.result @@ -2,14 +2,7 @@ call mtr.add_suppression('InnoDB: Cannot add field.*because after adding it, the SELECT @@innodb_page_size; @@innodb_page_size 32768 -SET GLOBAL innodb_file_per_table=ON; -SET @@innodb_strict_mode=ON; -SELECT @@innodb_file_per_table; -@@innodb_file_per_table -1 -SELECT @@innodb_strict_mode; -@@innodb_strict_mode -1 +SET innodb_strict_mode=ON; CREATE TABLE tab5(col1 CHAR (255), col2 CHAR (255), col3 CHAR(255),col4 CHAR(255), col5 CHAR(255), col6 CHAR(255), col7 CHAR(255), col8 CHAR(255), col9 CHAR(255),col10 CHAR(255), col11 CHAR(255), col12 CHAR(255), col13 CHAR(255),col14 CHAR(255),col15 CHAR(255),col16 CHAR(255), col17 CHAR(255), @@ -333,11 +326,9 @@ FLUSH TABLE t; ANALYZE TABLE t; Table Op Msg_type Msg_text test.t analyze status OK -SELECT stat_value FROM mysql.innodb_index_stats where database_name = 'test' and table_name= 't' and stat_name='n_leaf_pages'; -stat_value -6 -SELECT clustered_index_size from mysql.innodb_table_stats where database_name = 'test' and table_name= 't'; -clustered_index_size +SELECT clust_index_size FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS +WHERE name = 'test/t'; +clust_index_size 7 DROP TABLE t; CREATE TABLE t(col BLOB) ENGINE=InnoDB ROW_FORMAT=REDUNDANT; @@ -355,11 +346,9 @@ FLUSH TABLE t; ANALYZE TABLE t; Table Op Msg_type Msg_text test.t analyze status OK -SELECT stat_value FROM mysql.innodb_index_stats where database_name = 'test' and table_name= 't' and stat_name='n_leaf_pages'; -stat_value -4 -SELECT clustered_index_size from mysql.innodb_table_stats where database_name = 'test' and table_name= 't'; -clustered_index_size +SELECT clust_index_size FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS +WHERE name = 'test/t'; +clust_index_size 5 DROP TABLE t; CREATE TABLE t(col BLOB) ENGINE=InnoDB ROW_FORMAT=COMPACT; @@ -377,11 +366,8 @@ FLUSH TABLE t; ANALYZE TABLE t; Table Op Msg_type Msg_text test.t analyze status OK -SELECT stat_value FROM mysql.innodb_index_stats where database_name = 'test' and table_name= 't' and stat_name='n_leaf_pages'; -stat_value -4 -SELECT clustered_index_size from mysql.innodb_table_stats where database_name = 'test' and table_name= 't'; -clustered_index_size +SELECT clust_index_size FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS +WHERE name = 'test/t'; +clust_index_size 5 DROP TABLE t; -# Success |