Update results for new SHOW FULL COLUMNS

Portability fixes

6 files changed, 131 insertions, 129 deletions

diff --git a/include/my_tree.h b/include/my_tree.h
index 826c2b7c808..90139494f94 100644
--- a/include/my_tree.h
+++ b/include/my_tree.h
@@ -20,6 +20,8 @@
 extern "C" {
 #endif
 
+#include "my_base.h"		/* get 'enum ha_rkey_function' */
+
 #define MAX_TREE_HEIGHT	40	/* = max 1048576 leafs in tree */
 #define ELEMENT_KEY(tree,element)\
 (tree->offset_to_key ? (void*)((byte*) element+tree->offset_to_key) :\
diff --git a/mysql-test/r/select.result b/mysql-test/r/select.result
index 051aeb43b43..8c8e3b492b6 100644
--- a/mysql-test/r/select.result
+++ b/mysql-test/r/select.result
@@ -3207,23 +3207,23 @@ Tables_in_test (s%)
 show tables from test like "t?";
 Tables_in_test (t?)
 show full columns from t2;
-Field	Type	Null	Key	Default	Extra	Privileges
-auto	int(11)		PRI	NULL	auto_increment	select,insert,update,references
-fld1	int(6) unsigned zerofill		UNI	000000		select,insert,update,references
-companynr	tinyint(2) unsigned zerofill			00		select,insert,update,references
-fld3	char(30)		MUL			select,insert,update,references
-fld4	char(35)					select,insert,update,references
-fld5	char(35)					select,insert,update,references
-fld6	char(4)					select,insert,update,references
+Field	Type	Null	Key	Default	Extra	Privileges	Comment
+auto	int(11)		PRI	NULL	auto_increment	select,insert,update,references	
+fld1	int(6) unsigned zerofill		UNI	000000		select,insert,update,references	
+companynr	tinyint(2) unsigned zerofill			00		select,insert,update,references	
+fld3	char(30)		MUL			select,insert,update,references	
+fld4	char(35)					select,insert,update,references	
+fld5	char(35)					select,insert,update,references	
+fld6	char(4)					select,insert,update,references	
 show full columns from t2 from test like 'f%';
-Field	Type	Null	Key	Default	Extra	Privileges
-fld1	int(6) unsigned zerofill		UNI	000000		select,insert,update,references
-fld3	char(30)		MUL			select,insert,update,references
-fld4	char(35)					select,insert,update,references
-fld5	char(35)					select,insert,update,references
-fld6	char(4)					select,insert,update,references
+Field	Type	Null	Key	Default	Extra	Privileges	Comment
+fld1	int(6) unsigned zerofill		UNI	000000		select,insert,update,references	
+fld3	char(30)		MUL			select,insert,update,references	
+fld4	char(35)					select,insert,update,references	
+fld5	char(35)					select,insert,update,references	
+fld6	char(4)					select,insert,update,references	
 show full columns from t2 from test like 's%';
-Field	Type	Null	Key	Default	Extra	Privileges
+Field	Type	Null	Key	Default	Extra	Privileges	Comment
 show keys from t2;
 Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment
 t2	0	PRIMARY	1	auto	A	1199	NULL	NULL		BTREE	
diff --git a/mysql-test/r/type_blob.result b/mysql-test/r/type_blob.result
index 2047eed6227..6778679bda9 100644
--- a/mysql-test/r/type_blob.result
+++ b/mysql-test/r/type_blob.result
@@ -37,18 +37,18 @@ insert into t1 values (NULL,NULL,NULL,NULL);
 update t1 set c="",b=null where c="1";
 lock tables t1 READ;
 show full fields from t1;
-Field	Type	Null	Key	Default	Extra	Privileges
-t	text	YES		NULL		select,insert,update,references
-c	varchar(10)	YES		NULL		select,insert,update,references
-b	blob	YES		NULL		select,insert,update,references
-d	varchar(10) binary	YES		NULL		select,insert,update,references
+Field	Type	Null	Key	Default	Extra	Privileges	Comment
+t	text	YES		NULL		select,insert,update,references	
+c	varchar(10)	YES		NULL		select,insert,update,references	
+b	blob	YES		NULL		select,insert,update,references	
+d	varchar(10) binary	YES		NULL		select,insert,update,references	
 lock tables t1 WRITE;
 show full fields from t1;
-Field	Type	Null	Key	Default	Extra	Privileges
-t	text	YES		NULL		select,insert,update,references
-c	varchar(10)	YES		NULL		select,insert,update,references
-b	blob	YES		NULL		select,insert,update,references
-d	varchar(10) binary	YES		NULL		select,insert,update,references
+Field	Type	Null	Key	Default	Extra	Privileges	Comment
+t	text	YES		NULL		select,insert,update,references	
+c	varchar(10)	YES		NULL		select,insert,update,references	
+b	blob	YES		NULL		select,insert,update,references	
+d	varchar(10) binary	YES		NULL		select,insert,update,references	
 unlock tables;
 select t from t1 where t like "hello";
 t
diff --git a/mysql-test/r/type_float.result b/mysql-test/r/type_float.result
index e85bced353a..c6eca3abe8b 100644
--- a/mysql-test/r/type_float.result
+++ b/mysql-test/r/type_float.result
@@ -10,9 +10,9 @@ SELECT 1e1,1.e1,1.0e1,1e+1,1.e+1,1.0e+1,1e-1,1.e-1,1.0e-1;
 drop table if exists t1;
 create table t1 (f1 float(24),f2 float(52));
 show full columns from t1;
-Field	Type	Null	Key	Default	Extra	Privileges
-f1	float	YES		NULL		select,insert,update,references
-f2	double	YES		NULL		select,insert,update,references
+Field	Type	Null	Key	Default	Extra	Privileges	Comment
+f1	float	YES		NULL		select,insert,update,references	
+f2	double	YES		NULL		select,insert,update,references	
 insert into t1 values(10,10),(1e+5,1e+5),(1234567890,1234567890),(1e+10,1e+10),(1e+15,1e+15),(1e+20,1e+20),(1e+50,1e+50),(1e+150,1e+150);
 insert into t1 values(-10,-10),(1e-5,1e-5),(1e-10,1e-10),(1e-15,1e-15),(1e-20,1e-20),(1e-50,1e-50),(1e-150,1e-150);
 select * from t1;
@@ -69,19 +69,19 @@ min(a)
 drop table t1;
 create table t1 (f float, f2 float(24), f3 float(6,2), d double, d2 float(53), d3 double(10,3), de decimal, de2 decimal(6), de3 decimal(5,2), n numeric, n2 numeric(8), n3 numeric(5,6));
 show full columns from t1;
-Field	Type	Null	Key	Default	Extra	Privileges
-f	float	YES		NULL		select,insert,update,references
-f2	float	YES		NULL		select,insert,update,references
-f3	float(6,2)	YES		NULL		select,insert,update,references
-d	double	YES		NULL		select,insert,update,references
-d2	double	YES		NULL		select,insert,update,references
-d3	double(10,3)	YES		NULL		select,insert,update,references
-de	decimal(10,0)	YES		NULL		select,insert,update,references
-de2	decimal(6,0)	YES		NULL		select,insert,update,references
-de3	decimal(5,2)	YES		NULL		select,insert,update,references
-n	decimal(10,0)	YES		NULL		select,insert,update,references
-n2	decimal(8,0)	YES		NULL		select,insert,update,references
-n3	decimal(7,6)	YES		NULL		select,insert,update,references
+Field	Type	Null	Key	Default	Extra	Privileges	Comment
+f	float	YES		NULL		select,insert,update,references	
+f2	float	YES		NULL		select,insert,update,references	
+f3	float(6,2)	YES		NULL		select,insert,update,references	
+d	double	YES		NULL		select,insert,update,references	
+d2	double	YES		NULL		select,insert,update,references	
+d3	double(10,3)	YES		NULL		select,insert,update,references	
+de	decimal(10,0)	YES		NULL		select,insert,update,references	
+de2	decimal(6,0)	YES		NULL		select,insert,update,references	
+de3	decimal(5,2)	YES		NULL		select,insert,update,references	
+n	decimal(10,0)	YES		NULL		select,insert,update,references	
+n2	decimal(8,0)	YES		NULL		select,insert,update,references	
+n3	decimal(7,6)	YES		NULL		select,insert,update,references	
 drop table t1;
 create table t1 (a  decimal(7,3) not null, key (a));
 insert into t1 values ("0"),("-0.00"),("-0.01"),("-0.002"),("1");
diff --git a/mysql-test/r/type_ranges.result b/mysql-test/r/type_ranges.result
index fc7cc5255cf..54d8ff87b37 100644
--- a/mysql-test/r/type_ranges.result
+++ b/mysql-test/r/type_ranges.result
@@ -38,31 +38,31 @@ KEY (ulonglong,ulong),
 KEY (options,flags)
 );
 show full fields from t1;
-Field	Type	Null	Key	Default	Extra	Privileges
-auto	int(5) unsigned		PRI	NULL	auto_increment	select,insert,update,references
-string	varchar(10)	YES		hello		select,insert,update,references
-tiny	tinyint(4)		MUL	0		select,insert,update,references
-short	smallint(6)		MUL	1		select,insert,update,references
-medium	mediumint(8)		MUL	0		select,insert,update,references
-long_int	int(11)			0		select,insert,update,references
-longlong	bigint(13)		MUL	0		select,insert,update,references
-real_float	float(13,1)		MUL	0.0		select,insert,update,references
-real_double	double(16,4)	YES		NULL		select,insert,update,references
-utiny	tinyint(3) unsigned		MUL	0		select,insert,update,references
-ushort	smallint(5) unsigned zerofill		MUL	00000		select,insert,update,references
-umedium	mediumint(8) unsigned		MUL	0		select,insert,update,references
-ulong	int(11) unsigned		MUL	0		select,insert,update,references
-ulonglong	bigint(13) unsigned		MUL	0		select,insert,update,references
-time_stamp	timestamp(14)	YES		NULL		select,insert,update,references
-date_field	date	YES		NULL		select,insert,update,references
-time_field	time	YES		NULL		select,insert,update,references
-date_time	datetime	YES		NULL		select,insert,update,references
-blob_col	blob	YES		NULL		select,insert,update,references
-tinyblob_col	tinyblob	YES		NULL		select,insert,update,references
-mediumblob_col	mediumblob					select,insert,update,references
-longblob_col	longblob					select,insert,update,references
-options	enum('one','two','tree')		MUL	one		select,insert,update,references
-flags	set('one','two','tree')					select,insert,update,references
+Field	Type	Null	Key	Default	Extra	Privileges	Comment
+auto	int(5) unsigned		PRI	NULL	auto_increment	select,insert,update,references	
+string	varchar(10)	YES		hello		select,insert,update,references	
+tiny	tinyint(4)		MUL	0		select,insert,update,references	
+short	smallint(6)		MUL	1		select,insert,update,references	
+medium	mediumint(8)		MUL	0		select,insert,update,references	
+long_int	int(11)			0		select,insert,update,references	
+longlong	bigint(13)		MUL	0		select,insert,update,references	
+real_float	float(13,1)		MUL	0.0		select,insert,update,references	
+real_double	double(16,4)	YES		NULL		select,insert,update,references	
+utiny	tinyint(3) unsigned		MUL	0		select,insert,update,references	
+ushort	smallint(5) unsigned zerofill		MUL	00000		select,insert,update,references	
+umedium	mediumint(8) unsigned		MUL	0		select,insert,update,references	
+ulong	int(11) unsigned		MUL	0		select,insert,update,references	
+ulonglong	bigint(13) unsigned		MUL	0		select,insert,update,references	
+time_stamp	timestamp(14)	YES		NULL		select,insert,update,references	
+date_field	date	YES		NULL		select,insert,update,references	
+time_field	time	YES		NULL		select,insert,update,references	
+date_time	datetime	YES		NULL		select,insert,update,references	
+blob_col	blob	YES		NULL		select,insert,update,references	
+tinyblob_col	tinyblob	YES		NULL		select,insert,update,references	
+mediumblob_col	mediumblob					select,insert,update,references	
+longblob_col	longblob					select,insert,update,references	
+options	enum('one','two','tree')		MUL	one		select,insert,update,references	
+flags	set('one','two','tree')					select,insert,update,references	
 show keys from t1;
 Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment
 t1	0	PRIMARY	1	auto	A	0	NULL	NULL		BTREE	
@@ -168,57 +168,57 @@ drop table t2;
 create table t2 select * from t1;
 update t2 set string="changed" where auto=16;
 show full columns from t1;
-Field	Type	Null	Key	Default	Extra	Privileges
-auto	int(5) unsigned		MUL	NULL	auto_increment	select,insert,update,references
-string	varchar(10)	YES		new defaul		select,insert,update,references
-tiny	tinyint(4)		MUL	0		select,insert,update,references
-short	smallint(6)		MUL	0		select,insert,update,references
-medium	mediumint(8)		MUL	0		select,insert,update,references
-long_int	int(11)			0		select,insert,update,references
-longlong	bigint(13)		MUL	0		select,insert,update,references
-real_float	float(13,1)		MUL	0.0		select,insert,update,references
-real_double	double(16,4)	YES		NULL		select,insert,update,references
-utiny	tinyint(3) unsigned			0		select,insert,update,references
-ushort	smallint(5) unsigned zerofill			00000		select,insert,update,references
-umedium	mediumint(8) unsigned		MUL	0		select,insert,update,references
-ulong	int(11) unsigned		MUL	0		select,insert,update,references
-ulonglong	bigint(13) unsigned		MUL	0		select,insert,update,references
-time_stamp	timestamp(14)	YES		NULL		select,insert,update,references
-date_field	varchar(10)	YES		NULL		select,insert,update,references
-time_field	time	YES		NULL		select,insert,update,references
-date_time	datetime	YES		NULL		select,insert,update,references
-new_blob_col	varchar(20)	YES		NULL		select,insert,update,references
-tinyblob_col	tinyblob	YES		NULL		select,insert,update,references
-mediumblob_col	mediumblob					select,insert,update,references
-options	enum('one','two','tree')		MUL	one		select,insert,update,references
-flags	set('one','two','tree')					select,insert,update,references
-new_field	varchar(10)			new		select,insert,update,references
+Field	Type	Null	Key	Default	Extra	Privileges	Comment
+auto	int(5) unsigned		MUL	NULL	auto_increment	select,insert,update,references	
+string	varchar(10)	YES		new defaul		select,insert,update,references	
+tiny	tinyint(4)		MUL	0		select,insert,update,references	
+short	smallint(6)		MUL	0		select,insert,update,references	
+medium	mediumint(8)		MUL	0		select,insert,update,references	
+long_int	int(11)			0		select,insert,update,references	
+longlong	bigint(13)		MUL	0		select,insert,update,references	
+real_float	float(13,1)		MUL	0.0		select,insert,update,references	
+real_double	double(16,4)	YES		NULL		select,insert,update,references	
+utiny	tinyint(3) unsigned			0		select,insert,update,references	
+ushort	smallint(5) unsigned zerofill			00000		select,insert,update,references	
+umedium	mediumint(8) unsigned		MUL	0		select,insert,update,references	
+ulong	int(11) unsigned		MUL	0		select,insert,update,references	
+ulonglong	bigint(13) unsigned		MUL	0		select,insert,update,references	
+time_stamp	timestamp(14)	YES		NULL		select,insert,update,references	
+date_field	varchar(10)	YES		NULL		select,insert,update,references	
+time_field	time	YES		NULL		select,insert,update,references	
+date_time	datetime	YES		NULL		select,insert,update,references	
+new_blob_col	varchar(20)	YES		NULL		select,insert,update,references	
+tinyblob_col	tinyblob	YES		NULL		select,insert,update,references	
+mediumblob_col	mediumblob					select,insert,update,references	
+options	enum('one','two','tree')		MUL	one		select,insert,update,references	
+flags	set('one','two','tree')					select,insert,update,references	
+new_field	varchar(10)			new		select,insert,update,references	
 show full columns from t2;
-Field	Type	Null	Key	Default	Extra	Privileges
-auto	int(5) unsigned			0		select,insert,update,references
-string	varchar(10)	YES		new defaul		select,insert,update,references
-tiny	tinyint(4)			0		select,insert,update,references
-short	smallint(6)			0		select,insert,update,references
-medium	mediumint(8)			0		select,insert,update,references
-long_int	int(11)			0		select,insert,update,references
-longlong	bigint(13)			0		select,insert,update,references
-real_float	float(13,1)			0.0		select,insert,update,references
-real_double	double(16,4)	YES		NULL		select,insert,update,references
-utiny	tinyint(3) unsigned			0		select,insert,update,references
-ushort	smallint(5) unsigned zerofill			00000		select,insert,update,references
-umedium	mediumint(8) unsigned			0		select,insert,update,references
-ulong	int(11) unsigned			0		select,insert,update,references
-ulonglong	bigint(13) unsigned			0		select,insert,update,references
-time_stamp	timestamp(14)	YES		NULL		select,insert,update,references
-date_field	varchar(10)	YES		NULL		select,insert,update,references
-time_field	time	YES		NULL		select,insert,update,references
-date_time	datetime	YES		NULL		select,insert,update,references
-new_blob_col	varchar(20)	YES		NULL		select,insert,update,references
-tinyblob_col	tinyblob	YES		NULL		select,insert,update,references
-mediumblob_col	mediumblob					select,insert,update,references
-options	enum('one','two','tree')			one		select,insert,update,references
-flags	set('one','two','tree')					select,insert,update,references
-new_field	varchar(10)			new		select,insert,update,references
+Field	Type	Null	Key	Default	Extra	Privileges	Comment
+auto	int(5) unsigned			0		select,insert,update,references	
+string	varchar(10)	YES		new defaul		select,insert,update,references	
+tiny	tinyint(4)			0		select,insert,update,references	
+short	smallint(6)			0		select,insert,update,references	
+medium	mediumint(8)			0		select,insert,update,references	
+long_int	int(11)			0		select,insert,update,references	
+longlong	bigint(13)			0		select,insert,update,references	
+real_float	float(13,1)			0.0		select,insert,update,references	
+real_double	double(16,4)	YES		NULL		select,insert,update,references	
+utiny	tinyint(3) unsigned			0		select,insert,update,references	
+ushort	smallint(5) unsigned zerofill			00000		select,insert,update,references	
+umedium	mediumint(8) unsigned			0		select,insert,update,references	
+ulong	int(11) unsigned			0		select,insert,update,references	
+ulonglong	bigint(13) unsigned			0		select,insert,update,references	
+time_stamp	timestamp(14)	YES		NULL		select,insert,update,references	
+date_field	varchar(10)	YES		NULL		select,insert,update,references	
+time_field	time	YES		NULL		select,insert,update,references	
+date_time	datetime	YES		NULL		select,insert,update,references	
+new_blob_col	varchar(20)	YES		NULL		select,insert,update,references	
+tinyblob_col	tinyblob	YES		NULL		select,insert,update,references	
+mediumblob_col	mediumblob					select,insert,update,references	
+options	enum('one','two','tree')			one		select,insert,update,references	
+flags	set('one','two','tree')					select,insert,update,references	
+new_field	varchar(10)			new		select,insert,update,references	
 select t1.auto,t2.auto from t1,t2 where t1.auto=t2.auto and ((t1.string<>t2.string and (t1.string is not null or t2.string is not null)) or (t1.tiny<>t2.tiny and (t1.tiny is not null or t2.tiny is not null)) or (t1.short<>t2.short and (t1.short is not null or t2.short is not null)) or (t1.medium<>t2.medium and (t1.medium is not null or t2.medium is not null)) or (t1.long_int<>t2.long_int and (t1.long_int is not null or t2.long_int is not null)) or (t1.longlong<>t2.longlong and (t1.longlong is not null or t2.longlong is not null)) or (t1.real_float<>t2.real_float and (t1.real_float is not null or t2.real_float is not null)) or (t1.real_double<>t2.real_double and (t1.real_double is not null or t2.real_double is not null)) or (t1.utiny<>t2.utiny and (t1.utiny is not null or t2.utiny is not null)) or (t1.ushort<>t2.ushort and (t1.ushort is not null or t2.ushort is not null)) or (t1.umedium<>t2.umedium and (t1.umedium is not null or t2.umedium is not null)) or (t1.ulong<>t2.ulong and (t1.ulong is not null or t2.ulong is not null)) or (t1.ulonglong<>t2.ulonglong and (t1.ulonglong is not null or t2.ulonglong is not null)) or (t1.time_stamp<>t2.time_stamp and (t1.time_stamp is not null or t2.time_stamp is not null)) or (t1.date_field<>t2.date_field and (t1.date_field is not null or t2.date_field is not null)) or (t1.time_field<>t2.time_field and (t1.time_field is not null or t2.time_field is not null)) or (t1.date_time<>t2.date_time and (t1.date_time is not null or t2.date_time is not null)) or (t1.new_blob_col<>t2.new_blob_col and (t1.new_blob_col is not null or t2.new_blob_col is not null)) or (t1.tinyblob_col<>t2.tinyblob_col and (t1.tinyblob_col is not null or t2.tinyblob_col is not null)) or (t1.mediumblob_col<>t2.mediumblob_col and (t1.mediumblob_col is not null or t2.mediumblob_col is not null)) or (t1.options<>t2.options and (t1.options is not null or t2.options is not null)) or (t1.flags<>t2.flags and (t1.flags is not null or t2.flags is not null)) or (t1.new_field<>t2.new_field and (t1.new_field is not null or t2.new_field is not null)));
 auto	auto
 16	16
@@ -228,12 +228,12 @@ auto	auto
 drop table t2;
 create table t2 (primary key (auto)) select auto+1 as auto,1 as t1, "a" as t2, repeat("a",256) as t3, binary repeat("b",256) as t4 from t1;
 show full columns from t2;
-Field	Type	Null	Key	Default	Extra	Privileges
-auto	bigint(17) unsigned		PRI	0		select,insert,update,references
-t1	bigint(1)			0		select,insert,update,references
-t2	char(1)					select,insert,update,references
-t3	mediumtext					select,insert,update,references
-t4	mediumblob					select,insert,update,references
+Field	Type	Null	Key	Default	Extra	Privileges	Comment
+auto	bigint(17) unsigned		PRI	0		select,insert,update,references	
+t1	bigint(1)			0		select,insert,update,references	
+t2	char(1)					select,insert,update,references	
+t3	mediumtext					select,insert,update,references	
+t4	mediumblob					select,insert,update,references	
 select * from t2;
 auto	t1	t2	t3	t4
 11	1	a	aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa	bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb
@@ -251,10 +251,10 @@ create table t3 select * from t1, t2;
 Duplicate column name 'c'
 create table t3 select t1.c AS c1, t2.c AS c2,1 as "const" from t1, t2;
 show full columns from t3;
-Field	Type	Null	Key	Default	Extra	Privileges
-c1	int(11)	YES		NULL		select,insert,update,references
-c2	int(11)	YES		NULL		select,insert,update,references
-const	bigint(1)			0		select,insert,update,references
+Field	Type	Null	Key	Default	Extra	Privileges	Comment
+c1	int(11)	YES		NULL		select,insert,update,references	
+c2	int(11)	YES		NULL		select,insert,update,references	
+const	bigint(1)			0		select,insert,update,references	
 drop table t1,t2,t3;
 create table t1 ( myfield INT NOT NULL, UNIQUE INDEX (myfield), unique (myfield), index(myfield));
 drop table t1;
diff --git a/mysql-test/t/heap_btree.test b/mysql-test/t/heap_btree.test
index 2793a22e94d..e4b7d8674b9 100644
--- a/mysql-test/t/heap_btree.test
+++ b/mysql-test/t/heap_btree.test
@@ -60,12 +60,12 @@ insert into t1 values(1,1),(1,2),(2,3),(1,3),(1,4),(1,5),(1,6);
 select * from t1 where a=1; 
 insert into t1 values(1,1),(1,2),(2,3),(1,3),(1,4),(1,5),(1,6);
 select * from t1 where a=1;
---replace_result 0 x 1 x 2 x 3 x 4 x 5 x 6 x 7 x 8 x 9 x
+--replace_result 0 x 1 x 2 x 3 x 4 x 5 x 6 x 7 x 8 x 9 x 10 x 11 x 12 x 13 x 14 x
 explain select * from t1 where a=1 order by a,b;
---replace_result 0 x 1 x 2 x 3 x 4 x 5 x 6 x 7 x 8 x 9 x
+--replace_result 0 x 1 x 2 x 3 x 4 x 5 x 6 x 7 x 8 x 9 x 10 x 11 x 12 x 13 x 14 x
 explain select * from t1 where a=1 order by b;
 select * from t1 where b=1;
---replace_result 0 x 1 x 2 x 3 x 4 x 5 x 6 x 7 x 8 x 9 x
+--replace_result 0 x 1 x 2 x 3 x 4 x 5 x 6 x 7 x 8 x 9 x 10 x 11 x 12 x 13 x 14 x
 explain select * from t1 where b=1;
 drop table t1;