diff options
| author | holyfoot/hf@hfmain.(none) <> | 2007-03-22 23:59:20 +0400 |
|---|---|---|
| committer | holyfoot/hf@hfmain.(none) <> | 2007-03-22 23:59:20 +0400 |
| commit | 81b59fb3ccd1390283861a7ce4239aab85ae6226 (patch) | |
| tree | b10a0e80530fde746ab966228b412ab454f075eb /mysql-test/r/union.result | |
| parent | 0d55666960575f0668fdd712dc58fd8be71160c6 (diff) | |
| parent | 68f9ff123c399d5c709a3b0e44db7f68db713fe2 (diff) | |
| download | mariadb-git-81b59fb3ccd1390283861a7ce4239aab85ae6226.tar.gz | |
Merge mysql.com:/home/hf/work/mrg/mysql-5.0-opt
into mysql.com:/home/hf/work/mrg/mysql-5.1-opt
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 447a8e032cb..2c8fa5cb896 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(20) 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(24) 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; |