automerge

mysql-test/r/show_check.result

@@ -1334,7 +1334,7 @@ CREATE DATABASE `
 CREATE TABLE ``.`` (a int) ENGINE=Memory;
 SHOW TABLE STATUS FROM `` LIKE '';
 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
-	MEMORY	10	Fixed	0	8	#	#	#	0	NULL	NULL	NULL	NULL	latin1_swedish_ci	NULL		
+	MEMORY	10	Fixed	0	#	#	#	#	0	NULL	NULL	NULL	NULL	latin1_swedish_ci	NULL		
 DROP DATABASE ``;
 show columns from `#mysql50#????????`;
 Got one of the listed errors

mysql-test/t/show_check.test

@@ -1073,7 +1073,7 @@ set names latin1;
 SET NAMES latin1;
 CREATE DATABASE ``;
 CREATE TABLE ``.`` (a int) ENGINE=Memory;
---replace_column 7 # 8 # 9 #
+--replace_column 6 # 7 # 8 # 9 #
 SHOW TABLE STATUS FROM `` LIKE '';
 DROP DATABASE ``;