From 036b9dc9a1fa8418e0de5c9f8cf4fa2e5ee4513e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marko=20M=C3=A4kel=C3=A4?= Date: Mon, 12 Mar 2018 22:08:08 +0200 Subject: [PATCH] After-merge fix --- .../suite/innodb/r/default_row_format_create,dynamic.rdiff | 6 +++--- .../innodb/r/default_row_format_create,redundant.rdiff | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/mysql-test/suite/innodb/r/default_row_format_create,dynamic.rdiff b/mysql-test/suite/innodb/r/default_row_format_create,dynamic.rdiff index bb23b78213b..fd4a1c8b110 100644 --- a/mysql-test/suite/innodb/r/default_row_format_create,dynamic.rdiff +++ b/mysql-test/suite/innodb/r/default_row_format_create,dynamic.rdiff @@ -3,9 +3,9 @@ @@ -1,7 +1,7 @@ CREATE TABLE t1(c1 TEXT,c2 BLOB) ENGINE=InnoDB; SHOW TABLE STATUS LIKE 't1'; - Name Engine Version Row_format Rows Avg_row_length Data_length Max_data_length Index_length Data_free Auto_increment Create_time Update_time Check_time Collation Checksum Create_options Comment --t1 InnoDB # Compact # # # # # # NULL # NULL NULL latin1_swedish_ci NULL -+t1 InnoDB # Dynamic # # # # # # NULL # NULL NULL latin1_swedish_ci NULL + Name Engine Version Row_format Rows Avg_row_length Data_length Max_data_length Index_length Data_free Auto_increment Create_time Update_time Check_time Collation Checksum Create_options Comment Max_index_length Temporary +-t1 InnoDB # Compact # # # # # # NULL # NULL NULL latin1_swedish_ci NULL 0 N ++t1 InnoDB # Dynamic # # # # # # NULL # NULL NULL latin1_swedish_ci NULL 0 N DROP TABLE t1; CREATE TABLE t1(c1 TEXT,c2 BLOB) ENGINE=InnoDB ROW_FORMAT=DYNAMIC; SHOW TABLE STATUS LIKE 't1'; diff --git a/mysql-test/suite/innodb/r/default_row_format_create,redundant.rdiff b/mysql-test/suite/innodb/r/default_row_format_create,redundant.rdiff index 35aa402edd9..5258b7193fa 100644 --- a/mysql-test/suite/innodb/r/default_row_format_create,redundant.rdiff +++ b/mysql-test/suite/innodb/r/default_row_format_create,redundant.rdiff @@ -3,9 +3,9 @@ @@ -1,7 +1,7 @@ CREATE TABLE t1(c1 TEXT,c2 BLOB) ENGINE=InnoDB; SHOW TABLE STATUS LIKE 't1'; - Name Engine Version Row_format Rows Avg_row_length Data_length Max_data_length Index_length Data_free Auto_increment Create_time Update_time Check_time Collation Checksum Create_options Comment --t1 InnoDB # Compact # # # # # # NULL # NULL NULL latin1_swedish_ci NULL -+t1 InnoDB # Redundant # # # # # # NULL # NULL NULL latin1_swedish_ci NULL + Name Engine Version Row_format Rows Avg_row_length Data_length Max_data_length Index_length Data_free Auto_increment Create_time Update_time Check_time Collation Checksum Create_options Comment Max_index_length Temporary +-t1 InnoDB # Compact # # # # # # NULL # NULL NULL latin1_swedish_ci NULL 0 N ++t1 InnoDB # Redundant # # # # # # NULL # NULL NULL latin1_swedish_ci NULL 0 N DROP TABLE t1; CREATE TABLE t1(c1 TEXT,c2 BLOB) ENGINE=InnoDB ROW_FORMAT=DYNAMIC; SHOW TABLE STATUS LIKE 't1';