Commit a78764e8 authored by unknown's avatar unknown
Browse files

Merge to 5.0 


mysql-test/r/ctype_utf8.result:
  Correct wrong merge
mysql-test/r/show_check.result:
  Correct wrong merge
  Fix output from new test for SHOW CREATE TABLE, default '0' is not displayed in 5.0
mysql-test/r/sql_mode.result:
  Correct wrong merge
parent 51b07d27

mysql-test/r/ctype_utf8.result

+4 −4
Original line number Diff line number Diff line
@@ -413,7 +413,7 @@ Table Create Table 
t1	CREATE TABLE `t1` (

  `c` char(10) character set utf8 default NULL,

  UNIQUE KEY `a` USING HASH (`c`(1))

) ENGINE=HEAP DEFAULT CHARSET=latin1

) ENGINE=MEMORY DEFAULT CHARSET=latin1

insert into t1 values ('a'),('b'),('c'),('d'),('e'),('f');

insert into t1 values ('aa');

ERROR 23000: Duplicate entry 'aa' for key 1
@@ -449,7 +449,7 @@ Table Create Table 
t1	CREATE TABLE `t1` (

  `c` char(10) character set utf8 default NULL,

  UNIQUE KEY `a` USING BTREE (`c`(1))

) ENGINE=HEAP DEFAULT CHARSET=latin1

) ENGINE=MEMORY DEFAULT CHARSET=latin1

insert into t1 values ('a'),('b'),('c'),('d'),('e'),('f');

insert into t1 values ('aa');

ERROR 23000: Duplicate entry 'aa' for key 1
@@ -571,7 +571,7 @@ Table Create Table 
t1	CREATE TABLE `t1` (

  `c` char(10) character set utf8 collate utf8_bin default NULL,

  UNIQUE KEY `a` USING HASH (`c`(1))

) ENGINE=HEAP DEFAULT CHARSET=latin1

) ENGINE=MEMORY DEFAULT CHARSET=latin1

insert into t1 values ('a'),('b'),('c'),('d'),('e'),('f');

insert into t1 values ('aa');

ERROR 23000: Duplicate entry 'aa' for key 1
@@ -607,7 +607,7 @@ Table Create Table 
t1	CREATE TABLE `t1` (

  `c` char(10) character set utf8 collate utf8_bin default NULL,

  UNIQUE KEY `a` USING BTREE (`c`(1))

) ENGINE=HEAP DEFAULT CHARSET=latin1

) ENGINE=MEMORY DEFAULT CHARSET=latin1

insert into t1 values ('a'),('b'),('c'),('d'),('e'),('f');

insert into t1 values ('aa');

ERROR 23000: Duplicate entry 'aa' for key 1

mysql-test/r/show_check.result

+5 −5
Original line number Diff line number Diff line
@@ -420,7 +420,7 @@ Table Create Table 
t1	CREATE TABLE `t1` (

  `i` int(11) default NULL,

  KEY `i` USING HASH (`i`)

) ENGINE=HEAP DEFAULT CHARSET=latin1

) ENGINE=MEMORY DEFAULT CHARSET=latin1

DROP TABLE t1;

CREATE TABLE t1 (i int, KEY USING BTREE (i)) ENGINE=MEMORY;

SHOW CREATE TABLE t1;
@@ -428,7 +428,7 @@ Table Create Table 
t1	CREATE TABLE `t1` (

  `i` int(11) default NULL,

  KEY `i` USING BTREE (`i`)

) ENGINE=HEAP DEFAULT CHARSET=latin1

) ENGINE=MEMORY DEFAULT CHARSET=latin1

DROP TABLE t1;

CREATE TABLE t1 (i int, KEY (i)) ENGINE=MyISAM;

SHOW CREATE TABLE t1;
@@ -474,7 +474,7 @@ Table Create Table 
t1	CREATE TABLE `t1` (

  `i` int(11) default NULL,

  KEY `i` USING BTREE (`i`)

) ENGINE=HEAP DEFAULT CHARSET=latin1

) ENGINE=MEMORY DEFAULT CHARSET=latin1

DROP TABLE t1;

CREATE TABLE t1(

field1 text NOT NULL,
@@ -506,8 +506,8 @@ INDEX USING BTREE(c2) 
SHOW CREATE TABLE t1;

Table	Create Table

t1	CREATE TABLE `t1` (

  `c1` int(11) NOT NULL default '0',

  `c2` int(11) NOT NULL default '0',

  `c1` int(11) NOT NULL,

  `c2` int(11) NOT NULL,

  PRIMARY KEY  USING HASH (`c1`),

  KEY `c2` USING BTREE (`c2`)

) ENGINE=MyISAM DEFAULT CHARSET=latin1

mysql-test/r/sql_mode.result

+2 −2
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ t1 CREATE TABLE `t1` ( 
  `email` varchar(60) character set latin2 NOT NULL default '',

  PRIMARY KEY  (`a`),

  UNIQUE KEY `email` USING BTREE (`email`)

) ENGINE=HEAP DEFAULT CHARSET=latin1 ROW_FORMAT=DYNAMIC

) ENGINE=MEMORY DEFAULT CHARSET=latin1 ROW_FORMAT=DYNAMIC

set @@sql_mode="ansi_quotes";

show variables like 'sql_mode';

Variable_name	Value
@@ -31,7 +31,7 @@ t1 CREATE TABLE "t1" ( 
  "email" varchar(60) character set latin2 NOT NULL default '',

  PRIMARY KEY  ("a"),

  UNIQUE KEY "email" USING BTREE ("email")

) ENGINE=HEAP DEFAULT CHARSET=latin1 ROW_FORMAT=DYNAMIC

) ENGINE=MEMORY DEFAULT CHARSET=latin1 ROW_FORMAT=DYNAMIC

set @@sql_mode="no_table_options";

show variables like 'sql_mode';

Variable_name	Value