mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-30 10:31:54 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Post-merge fixes

Browse source
This commit is contained in:
unknown 2008-03-14 21:37:19 +01:00
parent 54d26e027f
commit 4e7979fe91
3 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
mysql-test/r/merge.result
View file

@ -969,21 +969,21 @@ CREATE TABLE m1(a INT) ENGINE=MERGE;
SHOW CREATE TABLE m1; SHOW CREATE TABLE m1;
Table Create Table Table Create Table
m1 CREATE TABLE `m1` ( m1 CREATE TABLE `m1` (
`a` int(11) default NULL `a` int(11) DEFAULT NULL
) ENGINE=MRG_MyISAM DEFAULT CHARSET=latin1 ) ENGINE=MRG_MyISAM DEFAULT CHARSET=latin1
DROP TABLE m1; DROP TABLE m1;
CREATE TABLE m1(a INT) ENGINE=MERGE UNION=(); CREATE TABLE m1(a INT) ENGINE=MERGE UNION=();
SHOW CREATE TABLE m1; SHOW CREATE TABLE m1;
Table Create Table Table Create Table
m1 CREATE TABLE `m1` ( m1 CREATE TABLE `m1` (
`a` int(11) default NULL `a` int(11) DEFAULT NULL
) ENGINE=MRG_MyISAM DEFAULT CHARSET=latin1 ) ENGINE=MRG_MyISAM DEFAULT CHARSET=latin1
ALTER TABLE m1 UNION=(t1); ALTER TABLE m1 UNION=(t1);
ALTER TABLE m1 UNION=(); ALTER TABLE m1 UNION=();
SHOW CREATE TABLE m1; SHOW CREATE TABLE m1;
Table Create Table Table Create Table
m1 CREATE TABLE `m1` ( m1 CREATE TABLE `m1` (
`a` int(11) default NULL `a` int(11) DEFAULT NULL
) ENGINE=MRG_MyISAM DEFAULT CHARSET=latin1 ) ENGINE=MRG_MyISAM DEFAULT CHARSET=latin1
DROP TABLE t1, m1; DROP TABLE t1, m1;
End of 5.0 tests End of 5.0 tests
@ -1151,7 +1151,7 @@ SHOW CREATE TABLE t4;
Table Create Table Table Create Table
t4 CREATE TABLE `t4` ( t4 CREATE TABLE `t4` (
`c1` int(11) DEFAULT NULL `c1` int(11) DEFAULT NULL
) ENGINE=MRG_MyISAM DEFAULT CHARSET=latin1 UNION=() ) ENGINE=MRG_MyISAM DEFAULT CHARSET=latin1
INSERT INTO t4 VALUES (4); INSERT INTO t4 VALUES (4);
ERROR HY000: Table 't4' is read only ERROR HY000: Table 't4' is read only
DROP TABLE t4; DROP TABLE t4;
@ -1168,7 +1168,7 @@ SHOW CREATE TABLE t4;
Table Create Table Table Create Table
t4 CREATE TABLE `t4` ( t4 CREATE TABLE `t4` (
`c1` int(11) DEFAULT NULL `c1` int(11) DEFAULT NULL
) ENGINE=MRG_MyISAM DEFAULT CHARSET=latin1 UNION=() ) ENGINE=MRG_MyISAM DEFAULT CHARSET=latin1
INSERT INTO t4 VALUES (4); INSERT INTO t4 VALUES (4);
ERROR HY000: Table 't4' is read only ERROR HY000: Table 't4' is read only
DROP TABLE t4; DROP TABLE t4;

1
mysql-test/r/type_set.result
View file

@ -93,3 +93,4 @@ c
1,2,3 1,2,3
64 64
DROP TABLE t1; DROP TABLE t1;
End of 5.0 tests

8
mysql-test/suite/rpl/r/rpl_row_create_table.result
View file

@ -45,7 +45,7 @@ Table t2
Create Table CREATE TABLE `t2` ( Create Table CREATE TABLE `t2` (
`a` int(11) DEFAULT NULL, `a` int(11) DEFAULT NULL,
`b` int(11) DEFAULT NULL `b` int(11) DEFAULT NULL
) ENGINE=MRG_MyISAM DEFAULT CHARSET=latin1 UNION=() ) ENGINE=MRG_MyISAM DEFAULT CHARSET=latin1
SHOW CREATE TABLE t3; SHOW CREATE TABLE t3;
Table t3 Table t3
Create Table CREATE TABLE `t3` ( Create Table CREATE TABLE `t3` (
@ -64,7 +64,7 @@ Table t2
Create Table CREATE TABLE `t2` ( Create Table CREATE TABLE `t2` (
`a` int(11) DEFAULT NULL, `a` int(11) DEFAULT NULL,
`b` int(11) DEFAULT NULL `b` int(11) DEFAULT NULL
) ENGINE=MRG_MyISAM DEFAULT CHARSET=latin1 UNION=() ) ENGINE=MRG_MyISAM DEFAULT CHARSET=latin1
SHOW CREATE TABLE t3; SHOW CREATE TABLE t3;
Table t3 Table t3
Create Table CREATE TABLE `t3` ( Create Table CREATE TABLE `t3` (
@ -185,7 +185,7 @@ Table t8
Create Table CREATE TABLE `t8` ( Create Table CREATE TABLE `t8` (
`a` int(11) DEFAULT NULL, `a` int(11) DEFAULT NULL,
`b` int(11) DEFAULT NULL `b` int(11) DEFAULT NULL
) ENGINE=MRG_MyISAM DEFAULT CHARSET=utf8 UNION=() ) ENGINE=MRG_MyISAM DEFAULT CHARSET=utf8
SHOW CREATE TABLE t9; SHOW CREATE TABLE t9;
Table t9 Table t9
Create Table CREATE TABLE `t9` ( Create Table CREATE TABLE `t9` (
@ -205,7 +205,7 @@ Table t8
Create Table CREATE TABLE `t8` ( Create Table CREATE TABLE `t8` (
`a` int(11) DEFAULT NULL, `a` int(11) DEFAULT NULL,
`b` int(11) DEFAULT NULL `b` int(11) DEFAULT NULL
) ENGINE=MRG_MyISAM DEFAULT CHARSET=utf8 UNION=() ) ENGINE=MRG_MyISAM DEFAULT CHARSET=utf8
SHOW CREATE TABLE t9; SHOW CREATE TABLE t9;
Table t9 Table t9
Create Table CREATE TABLE `t9` ( Create Table CREATE TABLE `t9` (