Commit ccd2742f authored by unknown's avatar unknown
Browse files

Merge neptunus.(none):/home/msvensson/mysql/bug10460/my51-bug10460 

into  neptunus.(none):/home/msvensson/mysql/mysql-5.1


mysql-test/r/bigint.result:
  Auto merged
mysql-test/r/binary.result:
  Auto merged
mysql-test/r/case.result:
  Auto merged
mysql-test/r/create.result:
  Auto merged
mysql-test/r/events.result:
  Auto merged
mysql-test/r/heap.result:
  Auto merged
mysql-test/r/information_schema.result:
  Auto merged
mysql-test/r/innodb.result:
  Auto merged
mysql-test/r/merge.result:
  Auto merged
mysql-test/r/mysqldump.result:
  Auto merged
mysql-test/r/partition.result:
  Auto merged
mysql-test/r/partition_02myisam.result:
  Auto merged
mysql-test/r/partition_mgm_err.result:
  Auto merged
mysql-test/r/show_check.result:
  Auto merged
mysql-test/r/sp.result:
  Auto merged
mysql-test/r/subselect.result:
  Auto merged
mysql-test/r/trigger.result:
  Auto merged
mysql-test/r/type_timestamp.result:
  Auto merged
sql/sql_show.cc:
  Auto merged
mysql-test/r/archive_gis.result:
  Merge bug10460
mysql-test/r/bdb_gis.result:
  Merge bug10460
mysql-test/r/func_system.result:
  Merge bug10460
mysql-test/r/innodb_gis.result:
  Merge bug10460
mysql-test/r/ndb_gis.result:
  Merge bug10460
parents fa1775b6 31a7a0d6

mysql-test/r/alter_table.result

+7 −7
Original line number Diff line number Diff line
@@ -468,25 +468,25 @@ delete from t1; 
show create table t1;

Table	Create Table

t1	CREATE TABLE `t1` (

  `a` char(10) character set koi8r default NULL

  `a` char(10) CHARACTER SET koi8r DEFAULT NULL

) ENGINE=MyISAM DEFAULT CHARSET=latin1

alter table t1 DEFAULT CHARACTER SET latin1;

show create table t1;

Table	Create Table

t1	CREATE TABLE `t1` (

  `a` char(10) character set koi8r default NULL

  `a` char(10) CHARACTER SET koi8r DEFAULT NULL

) ENGINE=MyISAM DEFAULT CHARSET=latin1

alter table t1 CONVERT TO CHARACTER SET latin1;

show create table t1;

Table	Create Table

t1	CREATE TABLE `t1` (

  `a` char(10) default NULL

  `a` char(10) DEFAULT NULL

) ENGINE=MyISAM DEFAULT CHARSET=latin1

alter table t1 DEFAULT CHARACTER SET cp1251;

show create table t1;

Table	Create Table

t1	CREATE TABLE `t1` (

  `a` char(10) character set latin1 default NULL

  `a` char(10) CHARACTER SET latin1 DEFAULT NULL

) ENGINE=MyISAM DEFAULT CHARSET=cp1251

drop table t1;

create table t1 (myblob longblob,mytext longtext)
@@ -495,14 +495,14 @@ show create table t1; 
Table	Create Table

t1	CREATE TABLE `t1` (

  `myblob` longblob,

  `mytext` longtext collate latin1_general_cs

  `mytext` longtext COLLATE latin1_general_cs

) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_cs

alter table t1 character set latin2;

show create table t1;

Table	Create Table

t1	CREATE TABLE `t1` (

  `myblob` longblob,

  `mytext` longtext character set latin1 collate latin1_general_cs

  `mytext` longtext CHARACTER SET latin1 COLLATE latin1_general_cs

) ENGINE=MyISAM DEFAULT CHARSET=latin2

drop table t1;

CREATE TABLE t1 (a int PRIMARY KEY, b INT UNIQUE);
@@ -511,7 +511,7 @@ SHOW CREATE TABLE t1; 
Table	Create Table

t1	CREATE TABLE `t1` (

  `a` int(11) NOT NULL,

  `b` int(11) default NULL,

  `b` int(11) DEFAULT NULL,

  UNIQUE KEY `b` (`b`)

) ENGINE=MyISAM DEFAULT CHARSET=latin1

ALTER TABLE t1 DROP PRIMARY KEY;

mysql-test/r/analyse.result

+30 −30
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` 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` varbinary(255) NOT NULL default '',

  `Std` varbinary(255) default NULL,

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

  `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` 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` 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` varbinary(255) NOT NULL default '',

  `Std` varbinary(255) default NULL,

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

  `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` 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` 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` varbinary(255) NOT NULL default '',

  `Std` varbinary(255) default NULL,

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

  `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` 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/archive.result

+6 −6
Original line number Diff line number Diff line
@@ -12340,12 +12340,12 @@ ALTER TABLE t2 DROP COLUMN fld6; 
SHOW CREATE TABLE t2;

Table	Create Table

t2	CREATE TABLE `t2` (

  `auto` int(11) default NULL,

  `fld1` int(6) unsigned zerofill NOT NULL default '000000',

  `companynr` tinyint(2) unsigned zerofill NOT NULL default '00',

  `fld3` char(30) NOT NULL default '',

  `fld4` char(35) NOT NULL default '',

  `fld5` char(35) NOT NULL default ''

  `auto` int(11) DEFAULT NULL,

  `fld1` int(6) unsigned zerofill NOT NULL DEFAULT '000000',

  `companynr` tinyint(2) unsigned zerofill NOT NULL DEFAULT '00',

  `fld3` char(30) NOT NULL DEFAULT '',

  `fld4` char(35) NOT NULL DEFAULT '',

  `fld5` char(35) NOT NULL DEFAULT ''

) ENGINE=ARCHIVE DEFAULT CHARSET=latin1

SELECT * FROM t2;

auto	fld1	companynr	fld3	fld4	fld5

mysql-test/r/archive_bitfield.result

+2 −2
Original line number Diff line number Diff line
@@ -6,8 +6,8 @@ b bit(64) 
show create table t1;

Table	Create Table

t1	CREATE TABLE `t1` (

  `pk1` int(11) NOT NULL auto_increment,

  `b` bit(64) default NULL,

  `pk1` int(11) NOT NULL AUTO_INCREMENT,

  `b` bit(64) DEFAULT NULL,

  PRIMARY KEY (`pk1`)

) ENGINE=ARCHIVE DEFAULT CHARSET=latin1

insert into t1 values

mysql-test/r/archive_gis.result

+2 −2
Original line number Diff line number Diff line
@@ -11,8 +11,8 @@ CREATE TABLE gis_geometry (fid INTEGER PRIMARY KEY AUTO_INCREMENT, g GEOMETRY); 
SHOW CREATE TABLE gis_point;

Table	Create Table

gis_point	CREATE TABLE `gis_point` (

  `fid` int(11) NOT NULL auto_increment,

  `g` point default NULL,

  `fid` int(11) NOT NULL AUTO_INCREMENT,

  `g` point DEFAULT NULL,

  PRIMARY KEY (`fid`)

) ENGINE=ARCHIVE DEFAULT CHARSET=latin1

SHOW FIELDS FROM gis_point;