Commit 13a2fad9 authored by unknown's avatar unknown

create.result:

  post-merge test result fixup


mysql-test/r/create.result:
  post-merge test result fixup
parent 37ee9a3a
...@@ -836,22 +836,22 @@ key a064_long_123456789_123456789_123456789_123456789_123456789_1234 (`c1`,`c2`, ...@@ -836,22 +836,22 @@ key a064_long_123456789_123456789_123456789_123456789_123456789_1234 (`c1`,`c2`,
show create table t1; show create table t1;
Table Create Table Table Create Table
t1 CREATE TABLE `t1` ( t1 CREATE TABLE `t1` (
`c1` char(10) default NULL, `c1` char(10) DEFAULT NULL,
`c2` char(10) default NULL, `c2` char(10) DEFAULT NULL,
`c3` char(10) default NULL, `c3` char(10) DEFAULT NULL,
`c4` char(10) default NULL, `c4` char(10) DEFAULT NULL,
`c5` char(10) default NULL, `c5` char(10) DEFAULT NULL,
`c6` char(10) default NULL, `c6` char(10) DEFAULT NULL,
`c7` char(10) default NULL, `c7` char(10) DEFAULT NULL,
`c8` char(10) default NULL, `c8` char(10) DEFAULT NULL,
`c9` char(10) default NULL, `c9` char(10) DEFAULT NULL,
`c10` char(10) default NULL, `c10` char(10) DEFAULT NULL,
`c11` char(10) default NULL, `c11` char(10) DEFAULT NULL,
`c12` char(10) default NULL, `c12` char(10) DEFAULT NULL,
`c13` char(10) default NULL, `c13` char(10) DEFAULT NULL,
`c14` char(10) default NULL, `c14` char(10) DEFAULT NULL,
`c15` char(10) default NULL, `c15` char(10) DEFAULT NULL,
`c16` char(10) default NULL, `c16` char(10) DEFAULT NULL,
KEY `a001_long_123456789_123456789_123456789_123456789_123456789_1234` (`c1`,`c2`,`c3`,`c4`,`c5`,`c6`,`c7`,`c8`,`c9`,`c10`,`c11`,`c12`,`c13`,`c14`,`c15`,`c16`), KEY `a001_long_123456789_123456789_123456789_123456789_123456789_1234` (`c1`,`c2`,`c3`,`c4`,`c5`,`c6`,`c7`,`c8`,`c9`,`c10`,`c11`,`c12`,`c13`,`c14`,`c15`,`c16`),
KEY `a002_long_123456789_123456789_123456789_123456789_123456789_1234` (`c1`,`c2`,`c3`,`c4`,`c5`,`c6`,`c7`,`c8`,`c9`,`c10`,`c11`,`c12`,`c13`,`c14`,`c15`,`c16`), KEY `a002_long_123456789_123456789_123456789_123456789_123456789_1234` (`c1`,`c2`,`c3`,`c4`,`c5`,`c6`,`c7`,`c8`,`c9`,`c10`,`c11`,`c12`,`c13`,`c14`,`c15`,`c16`),
KEY `a003_long_123456789_123456789_123456789_123456789_123456789_1234` (`c1`,`c2`,`c3`,`c4`,`c5`,`c6`,`c7`,`c8`,`c9`,`c10`,`c11`,`c12`,`c13`,`c14`,`c15`,`c16`), KEY `a003_long_123456789_123456789_123456789_123456789_123456789_1234` (`c1`,`c2`,`c3`,`c4`,`c5`,`c6`,`c7`,`c8`,`c9`,`c10`,`c11`,`c12`,`c13`,`c14`,`c15`,`c16`),
...@@ -921,22 +921,22 @@ flush tables; ...@@ -921,22 +921,22 @@ flush tables;
show create table t1; show create table t1;
Table Create Table Table Create Table
t1 CREATE TABLE `t1` ( t1 CREATE TABLE `t1` (
`c1` char(10) default NULL, `c1` char(10) DEFAULT NULL,
`c2` char(10) default NULL, `c2` char(10) DEFAULT NULL,
`c3` char(10) default NULL, `c3` char(10) DEFAULT NULL,
`c4` char(10) default NULL, `c4` char(10) DEFAULT NULL,
`c5` char(10) default NULL, `c5` char(10) DEFAULT NULL,
`c6` char(10) default NULL, `c6` char(10) DEFAULT NULL,
`c7` char(10) default NULL, `c7` char(10) DEFAULT NULL,
`c8` char(10) default NULL, `c8` char(10) DEFAULT NULL,
`c9` char(10) default NULL, `c9` char(10) DEFAULT NULL,
`c10` char(10) default NULL, `c10` char(10) DEFAULT NULL,
`c11` char(10) default NULL, `c11` char(10) DEFAULT NULL,
`c12` char(10) default NULL, `c12` char(10) DEFAULT NULL,
`c13` char(10) default NULL, `c13` char(10) DEFAULT NULL,
`c14` char(10) default NULL, `c14` char(10) DEFAULT NULL,
`c15` char(10) default NULL, `c15` char(10) DEFAULT NULL,
`c16` char(10) default NULL, `c16` char(10) DEFAULT NULL,
KEY `a001_long_123456789_123456789_123456789_123456789_123456789_1234` (`c1`,`c2`,`c3`,`c4`,`c5`,`c6`,`c7`,`c8`,`c9`,`c10`,`c11`,`c12`,`c13`,`c14`,`c15`,`c16`), KEY `a001_long_123456789_123456789_123456789_123456789_123456789_1234` (`c1`,`c2`,`c3`,`c4`,`c5`,`c6`,`c7`,`c8`,`c9`,`c10`,`c11`,`c12`,`c13`,`c14`,`c15`,`c16`),
KEY `a002_long_123456789_123456789_123456789_123456789_123456789_1234` (`c1`,`c2`,`c3`,`c4`,`c5`,`c6`,`c7`,`c8`,`c9`,`c10`,`c11`,`c12`,`c13`,`c14`,`c15`,`c16`), KEY `a002_long_123456789_123456789_123456789_123456789_123456789_1234` (`c1`,`c2`,`c3`,`c4`,`c5`,`c6`,`c7`,`c8`,`c9`,`c10`,`c11`,`c12`,`c13`,`c14`,`c15`,`c16`),
KEY `a003_long_123456789_123456789_123456789_123456789_123456789_1234` (`c1`,`c2`,`c3`,`c4`,`c5`,`c6`,`c7`,`c8`,`c9`,`c10`,`c11`,`c12`,`c13`,`c14`,`c15`,`c16`), KEY `a003_long_123456789_123456789_123456789_123456789_123456789_1234` (`c1`,`c2`,`c3`,`c4`,`c5`,`c6`,`c7`,`c8`,`c9`,`c10`,`c11`,`c12`,`c13`,`c14`,`c15`,`c16`),
...@@ -1077,22 +1077,22 @@ add key a064_long_123456789_123456789_123456789_123456789_123456789_1234 (`c1`,` ...@@ -1077,22 +1077,22 @@ add key a064_long_123456789_123456789_123456789_123456789_123456789_1234 (`c1`,`
show create table t1; show create table t1;
Table Create Table Table Create Table
t1 CREATE TABLE `t1` ( t1 CREATE TABLE `t1` (
`c1` char(10) default NULL, `c1` char(10) DEFAULT NULL,
`c2` char(10) default NULL, `c2` char(10) DEFAULT NULL,
`c3` char(10) default NULL, `c3` char(10) DEFAULT NULL,
`c4` char(10) default NULL, `c4` char(10) DEFAULT NULL,
`c5` char(10) default NULL, `c5` char(10) DEFAULT NULL,
`c6` char(10) default NULL, `c6` char(10) DEFAULT NULL,
`c7` char(10) default NULL, `c7` char(10) DEFAULT NULL,
`c8` char(10) default NULL, `c8` char(10) DEFAULT NULL,
`c9` char(10) default NULL, `c9` char(10) DEFAULT NULL,
`c10` char(10) default NULL, `c10` char(10) DEFAULT NULL,
`c11` char(10) default NULL, `c11` char(10) DEFAULT NULL,
`c12` char(10) default NULL, `c12` char(10) DEFAULT NULL,
`c13` char(10) default NULL, `c13` char(10) DEFAULT NULL,
`c14` char(10) default NULL, `c14` char(10) DEFAULT NULL,
`c15` char(10) default NULL, `c15` char(10) DEFAULT NULL,
`c16` char(10) default NULL, `c16` char(10) DEFAULT NULL,
KEY `a001_long_123456789_123456789_123456789_123456789_123456789_1234` (`c1`,`c2`,`c3`,`c4`,`c5`,`c6`,`c7`,`c8`,`c9`,`c10`,`c11`,`c12`,`c13`,`c14`,`c15`,`c16`), KEY `a001_long_123456789_123456789_123456789_123456789_123456789_1234` (`c1`,`c2`,`c3`,`c4`,`c5`,`c6`,`c7`,`c8`,`c9`,`c10`,`c11`,`c12`,`c13`,`c14`,`c15`,`c16`),
KEY `a002_long_123456789_123456789_123456789_123456789_123456789_1234` (`c1`,`c2`,`c3`,`c4`,`c5`,`c6`,`c7`,`c8`,`c9`,`c10`,`c11`,`c12`,`c13`,`c14`,`c15`,`c16`), KEY `a002_long_123456789_123456789_123456789_123456789_123456789_1234` (`c1`,`c2`,`c3`,`c4`,`c5`,`c6`,`c7`,`c8`,`c9`,`c10`,`c11`,`c12`,`c13`,`c14`,`c15`,`c16`),
KEY `a003_long_123456789_123456789_123456789_123456789_123456789_1234` (`c1`,`c2`,`c3`,`c4`,`c5`,`c6`,`c7`,`c8`,`c9`,`c10`,`c11`,`c12`,`c13`,`c14`,`c15`,`c16`), KEY `a003_long_123456789_123456789_123456789_123456789_123456789_1234` (`c1`,`c2`,`c3`,`c4`,`c5`,`c6`,`c7`,`c8`,`c9`,`c10`,`c11`,`c12`,`c13`,`c14`,`c15`,`c16`),
...@@ -1162,22 +1162,22 @@ flush tables; ...@@ -1162,22 +1162,22 @@ flush tables;
show create table t1; show create table t1;
Table Create Table Table Create Table
t1 CREATE TABLE `t1` ( t1 CREATE TABLE `t1` (
`c1` char(10) default NULL, `c1` char(10) DEFAULT NULL,
`c2` char(10) default NULL, `c2` char(10) DEFAULT NULL,
`c3` char(10) default NULL, `c3` char(10) DEFAULT NULL,
`c4` char(10) default NULL, `c4` char(10) DEFAULT NULL,
`c5` char(10) default NULL, `c5` char(10) DEFAULT NULL,
`c6` char(10) default NULL, `c6` char(10) DEFAULT NULL,
`c7` char(10) default NULL, `c7` char(10) DEFAULT NULL,
`c8` char(10) default NULL, `c8` char(10) DEFAULT NULL,
`c9` char(10) default NULL, `c9` char(10) DEFAULT NULL,
`c10` char(10) default NULL, `c10` char(10) DEFAULT NULL,
`c11` char(10) default NULL, `c11` char(10) DEFAULT NULL,
`c12` char(10) default NULL, `c12` char(10) DEFAULT NULL,
`c13` char(10) default NULL, `c13` char(10) DEFAULT NULL,
`c14` char(10) default NULL, `c14` char(10) DEFAULT NULL,
`c15` char(10) default NULL, `c15` char(10) DEFAULT NULL,
`c16` char(10) default NULL, `c16` char(10) DEFAULT NULL,
KEY `a001_long_123456789_123456789_123456789_123456789_123456789_1234` (`c1`,`c2`,`c3`,`c4`,`c5`,`c6`,`c7`,`c8`,`c9`,`c10`,`c11`,`c12`,`c13`,`c14`,`c15`,`c16`), KEY `a001_long_123456789_123456789_123456789_123456789_123456789_1234` (`c1`,`c2`,`c3`,`c4`,`c5`,`c6`,`c7`,`c8`,`c9`,`c10`,`c11`,`c12`,`c13`,`c14`,`c15`,`c16`),
KEY `a002_long_123456789_123456789_123456789_123456789_123456789_1234` (`c1`,`c2`,`c3`,`c4`,`c5`,`c6`,`c7`,`c8`,`c9`,`c10`,`c11`,`c12`,`c13`,`c14`,`c15`,`c16`), KEY `a002_long_123456789_123456789_123456789_123456789_123456789_1234` (`c1`,`c2`,`c3`,`c4`,`c5`,`c6`,`c7`,`c8`,`c9`,`c10`,`c11`,`c12`,`c13`,`c14`,`c15`,`c16`),
KEY `a003_long_123456789_123456789_123456789_123456789_123456789_1234` (`c1`,`c2`,`c3`,`c4`,`c5`,`c6`,`c7`,`c8`,`c9`,`c10`,`c11`,`c12`,`c13`,`c14`,`c15`,`c16`), KEY `a003_long_123456789_123456789_123456789_123456789_123456789_1234` (`c1`,`c2`,`c3`,`c4`,`c5`,`c6`,`c7`,`c8`,`c9`,`c10`,`c11`,`c12`,`c13`,`c14`,`c15`,`c16`),
...@@ -1260,23 +1260,23 @@ ERROR 42000: Identifier name 'a001_long_123456789_123456789_123456789_123456789_ ...@@ -1260,23 +1260,23 @@ ERROR 42000: Identifier name 'a001_long_123456789_123456789_123456789_123456789_
show create table t1; show create table t1;
Table Create Table Table Create Table
t1 CREATE TABLE `t1` ( t1 CREATE TABLE `t1` (
`c1` char(10) default NULL, `c1` char(10) DEFAULT NULL,
`c2` char(10) default NULL, `c2` char(10) DEFAULT NULL,
`c3` char(10) default NULL, `c3` char(10) DEFAULT NULL,
`c4` char(10) default NULL, `c4` char(10) DEFAULT NULL,
`c5` char(10) default NULL, `c5` char(10) DEFAULT NULL,
`c6` char(10) default NULL, `c6` char(10) DEFAULT NULL,
`c7` char(10) default NULL, `c7` char(10) DEFAULT NULL,
`c8` char(10) default NULL, `c8` char(10) DEFAULT NULL,
`c9` char(10) default NULL, `c9` char(10) DEFAULT NULL,
`c10` char(10) default NULL, `c10` char(10) DEFAULT NULL,
`c11` char(10) default NULL, `c11` char(10) DEFAULT NULL,
`c12` char(10) default NULL, `c12` char(10) DEFAULT NULL,
`c13` char(10) default NULL, `c13` char(10) DEFAULT NULL,
`c14` char(10) default NULL, `c14` char(10) DEFAULT NULL,
`c15` char(10) default NULL, `c15` char(10) DEFAULT NULL,
`c16` char(10) default NULL, `c16` char(10) DEFAULT NULL,
`c17` char(10) default NULL `c17` char(10) DEFAULT NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
drop table t1; drop table t1;
End of 4.1 tests End of 4.1 tests
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment