Commit e177c958 authored by unknown's avatar unknown
Browse files

Return character strings in table, type, possible_keys, key fields 

of EXPLAIN SELECT, rather than binary strings.
parent 5218404b

mysql-test/r/ps_1general.result

+14 −14
Original line number Diff line number Diff line
@@ -414,15 +414,15 @@ prepare stmt1 from ' explain select a from t1 order by b '; 
execute stmt1;

Catalog	Database	Table	Table_alias	Column	Column_alias	Name	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr

def					id	8	3	1	N	32801	0	8

def					select_type	253	19	6	N	1	31	63

def					table	253	64	2	N	1	31	63

def					type	253	10	3	N	1	31	63

def					possible_keys	253	4096	0	Y	0	31	63

def					key	253	64	0	Y	0	31	63

def					select_type	253	19	6	N	1	31	8

def					table	253	64	2	N	1	31	8

def					type	253	10	3	N	1	31	8

def					possible_keys	253	4096	0	Y	0	31	8

def					key	253	64	0	Y	0	31	8

def					key_len	8	3	0	Y	32800	0	8

def					ref	253	1024	0	Y	0	31	63

def					ref	253	1024	0	Y	0	31	8

def					rows	8	10	1	N	32801	0	8

def					Extra	253	255	14	N	1	31	63

def					Extra	253	255	14	N	1	31	8

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t1	ALL	NULL	NULL	NULL	NULL	4	Using filesort

SET @arg00=1 ;
@@ -430,15 +430,15 @@ prepare stmt1 from ' explain select a from t1 where a > ? order by b '; 
execute stmt1 using @arg00;

Catalog	Database	Table	Table_alias	Column	Column_alias	Name	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr

def					id	8	3	1	N	32801	0	8

def					select_type	253	19	6	N	1	31	63

def					table	253	64	2	N	1	31	63

def					type	253	10	5	N	1	31	63

def					possible_keys	253	4096	7	Y	0	31	63

def					key	253	64	7	Y	0	31	63

def					select_type	253	19	6	N	1	31	8

def					table	253	64	2	N	1	31	8

def					type	253	10	5	N	1	31	8

def					possible_keys	253	4096	7	Y	0	31	8

def					key	253	64	7	Y	0	31	8

def					key_len	8	3	1	Y	32800	0	8

def					ref	253	1024	0	Y	0	31	63

def					ref	253	1024	0	Y	0	31	8

def					rows	8	10	1	N	32801	0	8

def					Extra	253	255	27	N	1	31	63

def					Extra	253	255	27	N	1	31	8

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t1	range	PRIMARY	PRIMARY	4	NULL	3	Using where; Using filesort

test_sequence

mysql-test/r/ps_2myisam.result

+14 −14
Original line number Diff line number Diff line
@@ -574,15 +574,15 @@ prepare stmt1 from @stmt ; 
execute stmt1 ;

Catalog	Database	Table	Table_alias	Column	Column_alias	Name	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr

def					id	8	3	1	N	32801	0	8

def					select_type	253	19	18	N	1	31	63

def					table	253	64	16	N	1	31	63

def					type	253	10	3	N	1	31	63

def					possible_keys	253	4096	0	Y	0	31	63

def					key	253	64	0	Y	0	31	63

def					select_type	253	19	18	N	1	31	8

def					table	253	64	16	N	1	31	8

def					type	253	10	3	N	1	31	8

def					possible_keys	253	4096	0	Y	0	31	8

def					key	253	64	0	Y	0	31	8

def					key_len	8	3	0	Y	32800	0	8

def					ref	253	1024	0	Y	0	31	63

def					ref	253	1024	0	Y	0	31	8

def					rows	8	10	1	N	32801	0	8

def					Extra	253	255	44	N	1	31	63

def					Extra	253	255	44	N	1	31	8

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	PRIMARY	t_many_col_types	ALL	NULL	NULL	NULL	NULL	2	

1	PRIMARY	<derived6>	ALL	NULL	NULL	NULL	NULL	2	Using where
@@ -645,15 +645,15 @@ execute stmt1 using @arg00, @arg01, @arg02, @arg03, @arg04, @arg05, @arg06, 
@arg07, @arg08, @arg09 ;

Catalog	Database	Table	Table_alias	Column	Column_alias	Name	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr

def					id	8	3	1	N	32801	0	8

def					select_type	253	19	18	N	1	31	63

def					table	253	64	16	N	1	31	63

def					type	253	10	3	N	1	31	63

def					possible_keys	253	4096	0	Y	0	31	63

def					key	253	64	0	Y	0	31	63

def					select_type	253	19	18	N	1	31	8

def					table	253	64	16	N	1	31	8

def					type	253	10	3	N	1	31	8

def					possible_keys	253	4096	0	Y	0	31	8

def					key	253	64	0	Y	0	31	8

def					key_len	8	3	0	Y	32800	0	8

def					ref	253	1024	0	Y	0	31	63

def					ref	253	1024	0	Y	0	31	8

def					rows	8	10	1	N	32801	0	8

def					Extra	253	255	44	N	1	31	63

def					Extra	253	255	44	N	1	31	8

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	PRIMARY	t_many_col_types	ALL	NULL	NULL	NULL	NULL	2	

1	PRIMARY	<derived6>	ALL	NULL	NULL	NULL	NULL	2	Using where

mysql-test/r/ps_3innodb.result

+14 −14
Original line number Diff line number Diff line
@@ -574,15 +574,15 @@ prepare stmt1 from @stmt ; 
execute stmt1 ;

Catalog	Database	Table	Table_alias	Column	Column_alias	Name	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr

def					id	8	3	1	N	32801	0	8

def					select_type	253	19	18	N	1	31	63

def					table	253	64	16	N	1	31	63

def					type	253	10	3	N	1	31	63

def					possible_keys	253	4096	0	Y	0	31	63

def					key	253	64	0	Y	0	31	63

def					select_type	253	19	18	N	1	31	8

def					table	253	64	16	N	1	31	8

def					type	253	10	3	N	1	31	8

def					possible_keys	253	4096	0	Y	0	31	8

def					key	253	64	0	Y	0	31	8

def					key_len	8	3	0	Y	32800	0	8

def					ref	253	1024	0	Y	0	31	63

def					ref	253	1024	0	Y	0	31	8

def					rows	8	10	1	N	32801	0	8

def					Extra	253	255	44	N	1	31	63

def					Extra	253	255	44	N	1	31	8

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	PRIMARY	t_many_col_types	ALL	NULL	NULL	NULL	NULL	2	

1	PRIMARY	<derived6>	ALL	NULL	NULL	NULL	NULL	2	Using where
@@ -645,15 +645,15 @@ execute stmt1 using @arg00, @arg01, @arg02, @arg03, @arg04, @arg05, @arg06, 
@arg07, @arg08, @arg09 ;

Catalog	Database	Table	Table_alias	Column	Column_alias	Name	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr

def					id	8	3	1	N	32801	0	8

def					select_type	253	19	18	N	1	31	63

def					table	253	64	16	N	1	31	63

def					type	253	10	3	N	1	31	63

def					possible_keys	253	4096	0	Y	0	31	63

def					key	253	64	0	Y	0	31	63

def					select_type	253	19	18	N	1	31	8

def					table	253	64	16	N	1	31	8

def					type	253	10	3	N	1	31	8

def					possible_keys	253	4096	0	Y	0	31	8

def					key	253	64	0	Y	0	31	8

def					key_len	8	3	0	Y	32800	0	8

def					ref	253	1024	0	Y	0	31	63

def					ref	253	1024	0	Y	0	31	8

def					rows	8	10	1	N	32801	0	8

def					Extra	253	255	44	N	1	31	63

def					Extra	253	255	44	N	1	31	8

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	PRIMARY	t_many_col_types	ALL	NULL	NULL	NULL	NULL	2	

1	PRIMARY	<derived6>	ALL	NULL	NULL	NULL	NULL	2	Using where

mysql-test/r/ps_4heap.result

+14 −14
Original line number Diff line number Diff line
@@ -575,15 +575,15 @@ prepare stmt1 from @stmt ; 
execute stmt1 ;

Catalog	Database	Table	Table_alias	Column	Column_alias	Name	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr

def					id	8	3	1	N	32801	0	8

def					select_type	253	19	18	N	1	31	63

def					table	253	64	16	N	1	31	63

def					type	253	10	3	N	1	31	63

def					possible_keys	253	4096	0	Y	0	31	63

def					key	253	64	0	Y	0	31	63

def					select_type	253	19	18	N	1	31	8

def					table	253	64	16	N	1	31	8

def					type	253	10	3	N	1	31	8

def					possible_keys	253	4096	0	Y	0	31	8

def					key	253	64	0	Y	0	31	8

def					key_len	8	3	0	Y	32800	0	8

def					ref	253	1024	0	Y	0	31	63

def					ref	253	1024	0	Y	0	31	8

def					rows	8	10	1	N	32801	0	8

def					Extra	253	255	44	N	1	31	63

def					Extra	253	255	44	N	1	31	8

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	PRIMARY	t_many_col_types	ALL	NULL	NULL	NULL	NULL	2	

1	PRIMARY	<derived6>	ALL	NULL	NULL	NULL	NULL	2	Using where
@@ -646,15 +646,15 @@ execute stmt1 using @arg00, @arg01, @arg02, @arg03, @arg04, @arg05, @arg06, 
@arg07, @arg08, @arg09 ;

Catalog	Database	Table	Table_alias	Column	Column_alias	Name	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr

def					id	8	3	1	N	32801	0	8

def					select_type	253	19	18	N	1	31	63

def					table	253	64	16	N	1	31	63

def					type	253	10	3	N	1	31	63

def					possible_keys	253	4096	0	Y	0	31	63

def					key	253	64	0	Y	0	31	63

def					select_type	253	19	18	N	1	31	8

def					table	253	64	16	N	1	31	8

def					type	253	10	3	N	1	31	8

def					possible_keys	253	4096	0	Y	0	31	8

def					key	253	64	0	Y	0	31	8

def					key_len	8	3	0	Y	32800	0	8

def					ref	253	1024	0	Y	0	31	63

def					ref	253	1024	0	Y	0	31	8

def					rows	8	10	1	N	32801	0	8

def					Extra	253	255	44	N	1	31	63

def					Extra	253	255	44	N	1	31	8

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	PRIMARY	t_many_col_types	ALL	NULL	NULL	NULL	NULL	2	

1	PRIMARY	<derived6>	ALL	NULL	NULL	NULL	NULL	2	Using where

mysql-test/r/ps_5merge.result

+28 −28
Original line number Diff line number Diff line
@@ -617,15 +617,15 @@ prepare stmt1 from @stmt ; 
execute stmt1 ;

Catalog	Database	Table	Table_alias	Column	Column_alias	Name	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr

def					id	8	3	1	N	32801	0	8

def					select_type	253	19	18	N	1	31	63

def					table	253	64	16	N	1	31	63

def					type	253	10	3	N	1	31	63

def					possible_keys	253	4096	0	Y	0	31	63

def					key	253	64	0	Y	0	31	63

def					select_type	253	19	18	N	1	31	8

def					table	253	64	16	N	1	31	8

def					type	253	10	3	N	1	31	8

def					possible_keys	253	4096	0	Y	0	31	8

def					key	253	64	0	Y	0	31	8

def					key_len	8	3	0	Y	32800	0	8

def					ref	253	1024	0	Y	0	31	63

def					ref	253	1024	0	Y	0	31	8

def					rows	8	10	1	N	32801	0	8

def					Extra	253	255	44	N	1	31	63

def					Extra	253	255	44	N	1	31	8

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	PRIMARY	t_many_col_types	ALL	NULL	NULL	NULL	NULL	2	

1	PRIMARY	<derived6>	ALL	NULL	NULL	NULL	NULL	2	Using where
@@ -688,15 +688,15 @@ execute stmt1 using @arg00, @arg01, @arg02, @arg03, @arg04, @arg05, @arg06, 
@arg07, @arg08, @arg09 ;

Catalog	Database	Table	Table_alias	Column	Column_alias	Name	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr

def					id	8	3	1	N	32801	0	8

def					select_type	253	19	18	N	1	31	63

def					table	253	64	16	N	1	31	63

def					type	253	10	3	N	1	31	63

def					possible_keys	253	4096	0	Y	0	31	63

def					key	253	64	0	Y	0	31	63

def					select_type	253	19	18	N	1	31	8

def					table	253	64	16	N	1	31	8

def					type	253	10	3	N	1	31	8

def					possible_keys	253	4096	0	Y	0	31	8

def					key	253	64	0	Y	0	31	8

def					key_len	8	3	0	Y	32800	0	8

def					ref	253	1024	0	Y	0	31	63

def					ref	253	1024	0	Y	0	31	8

def					rows	8	10	1	N	32801	0	8

def					Extra	253	255	44	N	1	31	63

def					Extra	253	255	44	N	1	31	8

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	PRIMARY	t_many_col_types	ALL	NULL	NULL	NULL	NULL	2	

1	PRIMARY	<derived6>	ALL	NULL	NULL	NULL	NULL	2	Using where
@@ -1812,15 +1812,15 @@ prepare stmt1 from @stmt ; 
execute stmt1 ;

Catalog	Database	Table	Table_alias	Column	Column_alias	Name	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr

def					id	8	3	1	N	32801	0	8

def					select_type	253	19	18	N	1	31	63

def					table	253	64	16	N	1	31	63

def					type	253	10	3	N	1	31	63

def					possible_keys	253	4096	0	Y	0	31	63

def					key	253	64	0	Y	0	31	63

def					select_type	253	19	18	N	1	31	8

def					table	253	64	16	N	1	31	8

def					type	253	10	3	N	1	31	8

def					possible_keys	253	4096	0	Y	0	31	8

def					key	253	64	0	Y	0	31	8

def					key_len	8	3	0	Y	32800	0	8

def					ref	253	1024	0	Y	0	31	63

def					ref	253	1024	0	Y	0	31	8

def					rows	8	10	1	N	32801	0	8

def					Extra	253	255	44	N	1	31	63

def					Extra	253	255	44	N	1	31	8

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	PRIMARY	t_many_col_types	ALL	NULL	NULL	NULL	NULL	2	

1	PRIMARY	<derived6>	ALL	NULL	NULL	NULL	NULL	2	Using where
@@ -1883,15 +1883,15 @@ execute stmt1 using @arg00, @arg01, @arg02, @arg03, @arg04, @arg05, @arg06, 
@arg07, @arg08, @arg09 ;

Catalog	Database	Table	Table_alias	Column	Column_alias	Name	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr

def					id	8	3	1	N	32801	0	8

def					select_type	253	19	18	N	1	31	63

def					table	253	64	16	N	1	31	63

def					type	253	10	3	N	1	31	63

def					possible_keys	253	4096	0	Y	0	31	63

def					key	253	64	0	Y	0	31	63

def					select_type	253	19	18	N	1	31	8

def					table	253	64	16	N	1	31	8

def					type	253	10	3	N	1	31	8

def					possible_keys	253	4096	0	Y	0	31	8

def					key	253	64	0	Y	0	31	8

def					key_len	8	3	0	Y	32800	0	8

def					ref	253	1024	0	Y	0	31	63

def					ref	253	1024	0	Y	0	31	8

def					rows	8	10	1	N	32801	0	8

def					Extra	253	255	44	N	1	31	63

def					Extra	253	255	44	N	1	31	8

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	PRIMARY	t_many_col_types	ALL	NULL	NULL	NULL	NULL	2	

1	PRIMARY	<derived6>	ALL	NULL	NULL	NULL	NULL	2	Using where