Commit 764501e7 authored by unknown's avatar unknown
Browse files

After-merge clean-up

parent d4823d97

mysql-test/r/analyse.result

+18 −18
Original line number Diff line number Diff line
@@ -36,16 +36,16 @@ create table t2 select * from t1 where 0=1 procedure analyse(); 
show create table t2;

Table	Create Table

t2	CREATE TABLE `t2` (

  `Field_name` varchar(255) NOT NULL default '',

  `Min_value` varchar(255) default NULL,

  `Max_value` varchar(255) default NULL,

  `Field_name` varbinary(255) NOT NULL default '',

  `Min_value` varbinary(255) default NULL,

  `Max_value` varbinary(255) default NULL,

  `Min_length` bigint(11) NOT NULL default '0',

  `Max_length` bigint(11) NOT NULL default '0',

  `Empties_or_zeros` bigint(11) NOT NULL default '0',

  `Nulls` bigint(11) NOT NULL default '0',

  `Avg_value_or_avg_length` varchar(255) NOT NULL default '',

  `Std` varchar(255) default NULL,

  `Optimal_fieldtype` varchar(64) NOT NULL default ''

  `Avg_value_or_avg_length` varbinary(255) NOT NULL default '',

  `Std` varbinary(255) default NULL,

  `Optimal_fieldtype` varbinary(64) NOT NULL default ''

) ENGINE=MyISAM DEFAULT CHARSET=latin1

select * from t1 where 0=1 procedure analyse();

Field_name	Min_value	Max_value	Min_length	Max_length	Empties_or_zeros	Nulls	Avg_value_or_avg_length	Std	Optimal_fieldtype
@@ -55,16 +55,16 @@ create table t2 select * from t1 where 0=1 procedure analyse(); 
show create table t2;

Table	Create Table

t2	CREATE TABLE `t2` (

  `Field_name` varchar(255) NOT NULL default '',

  `Min_value` varchar(255) default NULL,

  `Max_value` varchar(255) default NULL,

  `Field_name` varbinary(255) NOT NULL default '',

  `Min_value` varbinary(255) default NULL,

  `Max_value` varbinary(255) default NULL,

  `Min_length` bigint(11) NOT NULL default '0',

  `Max_length` bigint(11) NOT NULL default '0',

  `Empties_or_zeros` bigint(11) NOT NULL default '0',

  `Nulls` bigint(11) NOT NULL default '0',

  `Avg_value_or_avg_length` varchar(255) NOT NULL default '',

  `Std` varchar(255) default NULL,

  `Optimal_fieldtype` varchar(64) NOT NULL default ''

  `Avg_value_or_avg_length` varbinary(255) NOT NULL default '',

  `Std` varbinary(255) default NULL,

  `Optimal_fieldtype` varbinary(64) NOT NULL default ''

) ENGINE=MyISAM DEFAULT CHARSET=latin1

select * from t2;

Field_name	Min_value	Max_value	Min_length	Max_length	Empties_or_zeros	Nulls	Avg_value_or_avg_length	Std	Optimal_fieldtype
@@ -78,16 +78,16 @@ create table t2 select * from t1 where 0=1 procedure analyse(); 
show create table t2;

Table	Create Table

t2	CREATE TABLE `t2` (

  `Field_name` varchar(255) NOT NULL default '',

  `Min_value` varchar(255) default NULL,

  `Max_value` varchar(255) default NULL,

  `Field_name` varbinary(255) NOT NULL default '',

  `Min_value` varbinary(255) default NULL,

  `Max_value` varbinary(255) default NULL,

  `Min_length` bigint(11) NOT NULL default '0',

  `Max_length` bigint(11) NOT NULL default '0',

  `Empties_or_zeros` bigint(11) NOT NULL default '0',

  `Nulls` bigint(11) NOT NULL default '0',

  `Avg_value_or_avg_length` varchar(255) NOT NULL default '',

  `Std` varchar(255) default NULL,

  `Optimal_fieldtype` varchar(64) NOT NULL default ''

  `Avg_value_or_avg_length` varbinary(255) NOT NULL default '',

  `Std` varbinary(255) default NULL,

  `Optimal_fieldtype` varbinary(64) NOT NULL default ''

) ENGINE=MyISAM DEFAULT CHARSET=latin1

select * from t2;

Field_name	Min_value	Max_value	Min_length	Max_length	Empties_or_zeros	Nulls	Avg_value_or_avg_length	Std	Optimal_fieldtype

mysql-test/r/case.result

+6 −6
Original line number Diff line number Diff line
@@ -98,10 +98,10 @@ Table Create Table 
t1	CREATE TABLE `t1` (

  `c1` varchar(1) character set latin1 collate latin1_danish_ci NOT NULL default '',

  `c2` varchar(1) character set latin1 collate latin1_danish_ci NOT NULL default '',

  `c3` varchar(1) NOT NULL default '',

  `c4` varchar(1) NOT NULL default '',

  `c5` varchar(3) NOT NULL default '',

  `c6` varchar(3) NOT NULL default '',

  `c3` varbinary(1) NOT NULL default '',

  `c4` varbinary(1) NOT NULL default '',

  `c5` varbinary(3) NOT NULL default '',

  `c6` varbinary(3) NOT NULL default '',

  `c7` double(3,1) NOT NULL default '0.0',

  `c8` double(3,1) NOT NULL default '0.0',

  `c9` double(3,1) default NULL
@@ -149,8 +149,8 @@ t1 CREATE TABLE `t1` ( 
  `COALESCE(1.0)` double(3,1) NOT NULL default '0.0',

  `COALESCE('a')` varchar(1) NOT NULL default '',

  `COALESCE(1,1.0)` double(3,1) NOT NULL default '0.0',

  `COALESCE(1,'1')` varchar(1) NOT NULL default '',

  `COALESCE(1.1,'1')` varchar(3) NOT NULL default '',

  `COALESCE(1,'1')` varbinary(1) NOT NULL default '',

  `COALESCE(1.1,'1')` varbinary(3) NOT NULL default '',

  `COALESCE('a' COLLATE latin1_bin,'b')` varchar(1) character set latin1 collate latin1_bin NOT NULL default ''

) ENGINE=MyISAM DEFAULT CHARSET=latin1

DROP TABLE t1;

mysql-test/r/ps_1general.result

+4 −4
Original line number Diff line number Diff line
@@ -471,7 +471,7 @@ ERROR HY000: This command is not supported in the prepared statement protocol ye 
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					id	8	3	1	N	32929	0	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
@@ -479,7 +479,7 @@ def possible_keys 253 4096 0 Y 0 31 8 
def					key	253	64	0	Y	0	31	8

def					key_len	253	4096	0	Y	128	31	63

def					ref	253	1024	0	Y	0	31	8

def					rows	8	10	1	N	32801	0	8

def					rows	8	10	1	N	32929	0	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
@@ -487,7 +487,7 @@ SET @arg00=1 ; 
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					id	8	3	1	N	32929	0	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
@@ -495,7 +495,7 @@ def possible_keys 253 4096 7 Y 0 31 8 
def					key	253	64	7	Y	0	31	8

def					key_len	253	4096	1	Y	128	31	63

def					ref	253	1024	0	Y	0	31	8

def					rows	8	10	1	N	32801	0	8

def					rows	8	10	1	N	32929	0	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

mysql-test/r/ps_2myisam.result

+2 −2
Original line number Diff line number Diff line
@@ -1145,7 +1145,7 @@ test_sequence 
prepare stmt1 from ' explain select * from t9 ' ;

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					id	8	3	1	N	32929	0	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
@@ -1153,7 +1153,7 @@ def possible_keys 253 4096 0 Y 0 31 8 
def					key	253	64	0	Y	0	31	8

def					key_len	253	4096	0	Y	128	31	63

def					ref	253	1024	0	Y	0	31	8

def					rows	8	10	1	N	32801	0	8

def					rows	8	10	1	N	32929	0	63

def					Extra	253	255	0	N	1	31	8

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t9	ALL	NULL	NULL	NULL	NULL	2

mysql-test/r/ps_3innodb.result

+2 −2
Original line number Diff line number Diff line
@@ -1145,7 +1145,7 @@ test_sequence 
prepare stmt1 from ' explain select * from t9 ' ;

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					id	8	3	1	N	32929	0	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
@@ -1153,7 +1153,7 @@ def possible_keys 253 4096 0 Y 0 31 8 
def					key	253	64	0	Y	0	31	8

def					key_len	253	4096	0	Y	128	31	63

def					ref	253	1024	0	Y	0	31	8

def					rows	8	10	1	N	32801	0	8

def					rows	8	10	1	N	32929	0	63

def					Extra	253	255	0	N	1	31	8

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t9	ALL	NULL	NULL	NULL	NULL	2