diff options
| -rw-r--r-- | mysql-test/r/lowercase_table2.result | 4 | ||||
| -rw-r--r-- | mysql-test/r/rpl_row_UUID.result | 4 | ||||
| -rw-r--r-- | mysql-test/r/rpl_row_create_table.result | 68 |
3 files changed, 38 insertions, 38 deletions
diff --git a/mysql-test/r/lowercase_table2.result b/mysql-test/r/lowercase_table2.result index 44235cbf900..a55ebaf7766 100644 --- a/mysql-test/r/lowercase_table2.result +++ b/mysql-test/r/lowercase_table2.result @@ -13,7 +13,7 @@ T1 SHOW CREATE TABLE T1; Table Create Table T1 CREATE TABLE `T1` ( - `a` int(11) default NULL + `a` int(11) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 RENAME TABLE T1 TO T2; SHOW TABLES LIKE "T2"; @@ -68,7 +68,7 @@ T1 SHOW CREATE TABLE T1; Table Create Table T1 CREATE TABLE `T1` ( - `a` int(11) default NULL + `a` int(11) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 RENAME TABLE T1 TO T2; SHOW TABLES LIKE "T2"; diff --git a/mysql-test/r/rpl_row_UUID.result b/mysql-test/r/rpl_row_UUID.result index 8043148a542..f56dc145901 100644 --- a/mysql-test/r/rpl_row_UUID.result +++ b/mysql-test/r/rpl_row_UUID.result @@ -29,9 +29,9 @@ insert into t2 values(fn1(2)); SHOW CREATE TABLE test.t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` int(11) NOT NULL default '0', + `a` int(11) NOT NULL DEFAULT '0', `blob_column` longblob, - `vchar_column` varchar(100) default NULL, + `vchar_column` varchar(100) DEFAULT NULL, PRIMARY KEY (`a`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 DROP PROCEDURE test.p1; diff --git a/mysql-test/r/rpl_row_create_table.result b/mysql-test/r/rpl_row_create_table.result index 4d485802a53..bf6a2fd0e8b 100644 --- a/mysql-test/r/rpl_row_create_table.result +++ b/mysql-test/r/rpl_row_create_table.result @@ -37,39 +37,39 @@ Info use `test`; CREATE TABLE t4 (a INT, b INT) ENGINE=Merge CHARSET=utf8 SHOW CREATE TABLE t1; Table t1 Create Table CREATE TABLE `t1` ( - `a` int(11) default NULL, - `b` int(11) default NULL + `a` int(11) DEFAULT NULL, + `b` int(11) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 SHOW CREATE TABLE t2; Table t2 Create Table CREATE TABLE `t2` ( - `a` int(11) default NULL, - `b` int(11) default NULL + `a` int(11) DEFAULT NULL, + `b` int(11) DEFAULT NULL ) ENGINE=MRG_MyISAM DEFAULT CHARSET=latin1 UNION=() SHOW CREATE TABLE t3; Table t3 Create Table CREATE TABLE `t3` ( - `a` int(11) default NULL, - `b` int(11) default NULL + `a` int(11) DEFAULT NULL, + `b` int(11) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=utf8 **** On Slave **** SHOW CREATE TABLE t1; Table t1 Create Table CREATE TABLE `t1` ( - `a` int(11) default NULL, - `b` int(11) default NULL + `a` int(11) DEFAULT NULL, + `b` int(11) DEFAULT NULL ) ENGINE=MEMORY DEFAULT CHARSET=latin1 SHOW CREATE TABLE t2; Table t2 Create Table CREATE TABLE `t2` ( - `a` int(11) default NULL, - `b` int(11) default NULL + `a` int(11) DEFAULT NULL, + `b` int(11) DEFAULT NULL ) ENGINE=MRG_MyISAM DEFAULT CHARSET=latin1 UNION=() SHOW CREATE TABLE t3; Table t3 Create Table CREATE TABLE `t3` ( - `a` int(11) default NULL, - `b` int(11) default NULL + `a` int(11) DEFAULT NULL, + `b` int(11) DEFAULT NULL ) ENGINE=MEMORY DEFAULT CHARSET=utf8 CREATE TABLE t5 (b INT, c INT) SELECT * FROM t3; CREATE TEMPORARY TABLE tt3 (a INT, b INT); @@ -79,18 +79,18 @@ CREATE TABLE t6 (b INT, c INT) SELECT * FROM tt3; SHOW CREATE TABLE t5; Table t5 Create Table CREATE TABLE `t5` ( - `c` int(11) default NULL, - `a` int(11) default NULL, - `b` int(11) default NULL + `c` int(11) DEFAULT NULL, + `a` int(11) DEFAULT NULL, + `b` int(11) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 SELECT * FROM t5 ORDER BY a,b,c; c a b SHOW CREATE TABLE t6; Table t6 Create Table CREATE TABLE `t6` ( - `c` int(11) default NULL, - `a` int(11) default NULL, - `b` int(11) default NULL + `c` int(11) DEFAULT NULL, + `a` int(11) DEFAULT NULL, + `b` int(11) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 SELECT * FROM t6 ORDER BY a,b,c; c a b @@ -104,18 +104,18 @@ NULL 6 12 SHOW CREATE TABLE t5; Table t5 Create Table CREATE TABLE `t5` ( - `c` int(11) default NULL, - `a` int(11) default NULL, - `b` int(11) default NULL + `c` int(11) DEFAULT NULL, + `a` int(11) DEFAULT NULL, + `b` int(11) DEFAULT NULL ) ENGINE=MEMORY DEFAULT CHARSET=latin1 SELECT * FROM t5 ORDER BY a,b,c; c a b SHOW CREATE TABLE t6; Table t6 Create Table CREATE TABLE `t6` ( - `c` int(11) default NULL, - `a` int(11) default NULL, - `b` int(11) default NULL + `c` int(11) DEFAULT NULL, + `a` int(11) DEFAULT NULL, + `b` int(11) DEFAULT NULL ) ENGINE=MEMORY DEFAULT CHARSET=latin1 SELECT * FROM t6 ORDER BY a,b,c; c a b @@ -182,32 +182,32 @@ CREATE TEMPORARY TABLE tt6 LIKE tt4; SHOW CREATE TABLE t8; Table t8 Create Table CREATE TABLE `t8` ( - `a` int(11) default NULL, - `b` int(11) default NULL + `a` int(11) DEFAULT NULL, + `b` int(11) DEFAULT NULL ) ENGINE=MRG_MyISAM DEFAULT CHARSET=utf8 UNION=() SHOW CREATE TABLE t9; Table t9 Create Table CREATE TABLE `t9` ( - `a` int(11) default NULL, - `b` int(11) default NULL + `a` int(11) DEFAULT NULL, + `b` int(11) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 SHOW BINLOG EVENTS FROM 1548; Log_name Pos Event_type Server_id End_log_pos Info master-bin.000001 1548 Query 1 1634 use `test`; CREATE TABLE t8 LIKE t4 master-bin.000001 1634 Query 1 1773 use `test`; CREATE TABLE `t9` ( - `a` int(11) default NULL, - `b` int(11) default NULL + `a` int(11) DEFAULT NULL, + `b` int(11) DEFAULT NULL ) **** On Slave **** SHOW CREATE TABLE t8; Table t8 Create Table CREATE TABLE `t8` ( - `a` int(11) default NULL, - `b` int(11) default NULL + `a` int(11) DEFAULT NULL, + `b` int(11) DEFAULT NULL ) ENGINE=MRG_MyISAM DEFAULT CHARSET=utf8 UNION=() SHOW CREATE TABLE t9; Table t9 Create Table CREATE TABLE `t9` ( - `a` int(11) default NULL, - `b` int(11) default NULL + `a` int(11) DEFAULT NULL, + `b` int(11) DEFAULT NULL ) ENGINE=MEMORY DEFAULT CHARSET=latin1 |