diff options
| author | unknown <istruewing@stella.local> | 2008-03-14 21:37:19 +0100 |
|---|---|---|
| committer | unknown <istruewing@stella.local> | 2008-03-14 21:37:19 +0100 |
| commit | 4e7979fe91a5341b3a07a0ef489e87b57e2686d6 (patch) | |
| tree | 9072d708ae8a74fd8cbf063a227c39ec1a641f4b /mysql-test/r/merge.result | |
| parent | 54d26e027f9b076b3588ec74342a37861af0ce0b (diff) | |
| download | mariadb-git-4e7979fe91a5341b3a07a0ef489e87b57e2686d6.tar.gz | |
Post-merge fixes
Diffstat (limited to 'mysql-test/r/merge.result')
| -rw-r--r-- | mysql-test/r/merge.result | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/mysql-test/r/merge.result b/mysql-test/r/merge.result index 170cffc13d5..4c05000573c 100644 --- a/mysql-test/r/merge.result +++ b/mysql-test/r/merge.result @@ -969,21 +969,21 @@ CREATE TABLE m1(a INT) ENGINE=MERGE; SHOW CREATE TABLE m1; Table Create Table m1 CREATE TABLE `m1` ( - `a` int(11) default NULL + `a` int(11) DEFAULT NULL ) ENGINE=MRG_MyISAM DEFAULT CHARSET=latin1 DROP TABLE m1; CREATE TABLE m1(a INT) ENGINE=MERGE UNION=(); SHOW CREATE TABLE m1; Table Create Table m1 CREATE TABLE `m1` ( - `a` int(11) default NULL + `a` int(11) DEFAULT NULL ) ENGINE=MRG_MyISAM DEFAULT CHARSET=latin1 ALTER TABLE m1 UNION=(t1); ALTER TABLE m1 UNION=(); SHOW CREATE TABLE m1; Table Create Table m1 CREATE TABLE `m1` ( - `a` int(11) default NULL + `a` int(11) DEFAULT NULL ) ENGINE=MRG_MyISAM DEFAULT CHARSET=latin1 DROP TABLE t1, m1; End of 5.0 tests @@ -1151,7 +1151,7 @@ SHOW CREATE TABLE t4; Table Create Table t4 CREATE TABLE `t4` ( `c1` int(11) DEFAULT NULL -) ENGINE=MRG_MyISAM DEFAULT CHARSET=latin1 UNION=() +) ENGINE=MRG_MyISAM DEFAULT CHARSET=latin1 INSERT INTO t4 VALUES (4); ERROR HY000: Table 't4' is read only DROP TABLE t4; @@ -1168,7 +1168,7 @@ SHOW CREATE TABLE t4; Table Create Table t4 CREATE TABLE `t4` ( `c1` int(11) DEFAULT NULL -) ENGINE=MRG_MyISAM DEFAULT CHARSET=latin1 UNION=() +) ENGINE=MRG_MyISAM DEFAULT CHARSET=latin1 INSERT INTO t4 VALUES (4); ERROR HY000: Table 't4' is read only DROP TABLE t4; |