diff options
| author | holyfoot/hf@mysql.com/hfmain.(none) <> | 2007-03-23 01:04:31 +0400 |
|---|---|---|
| committer | holyfoot/hf@mysql.com/hfmain.(none) <> | 2007-03-23 01:04:31 +0400 |
| commit | e1044ab5d1f9c707cb60cef857e96a44ba45a39b (patch) | |
| tree | d4c8fbb19d09dbc74651c8bdb4ae99ad250aac7a /mysql-test/r/union.result | |
| parent | a7f5f07b6f0ba21e631ffab467885def890ecae6 (diff) | |
| download | mariadb-git-e1044ab5d1f9c707cb60cef857e96a44ba45a39b.tar.gz | |
merging
Diffstat (limited to 'mysql-test/r/union.result')
| -rw-r--r-- | mysql-test/r/union.result | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/r/union.result b/mysql-test/r/union.result index 2c8fa5cb896..275f3357c65 100644 --- a/mysql-test/r/union.result +++ b/mysql-test/r/union.result @@ -554,7 +554,7 @@ aa show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` varbinary(2) NOT NULL default '' + `a` varbinary(2) NOT NULL DEFAULT '' ) ENGINE=MyISAM DEFAULT CHARSET=latin1 drop table t1; create table t1 SELECT 12 as a UNION select 12.2 as a; @@ -655,7 +655,7 @@ f show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `f` varbinary(12) default NULL + `f` varbinary(12) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 drop table t1; create table t1 SELECT y from t2 UNION select da from t2; |