summaryrefslogtreecommitdiff
path: root/mysql-test
diff options
context:
space:
mode:
authorunknown <holyfoot/hf@mysql.com/deer.(none)>2006-11-09 12:41:15 +0400
committerunknown <holyfoot/hf@mysql.com/deer.(none)>2006-11-09 12:41:15 +0400
commit4b60bdc9c7e4cff239ec8e1839a497ff64c8cf09 (patch)
treee60a897efe2d6c38fd87399cab6ae95be6f756f6 /mysql-test
parent0119e00f0dd6639c3f5a80aa67e40b0a0d670e99 (diff)
downloadmariadb-git-4b60bdc9c7e4cff239ec8e1839a497ff64c8cf09.tar.gz
merging
mysql-test/r/subselect.result: result fixed
Diffstat (limited to 'mysql-test')
-rw-r--r--mysql-test/r/subselect.result4
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/r/subselect.result b/mysql-test/r/subselect.result
index 0b72814797c..51d8227b9f3 100644
--- a/mysql-test/r/subselect.result
+++ b/mysql-test/r/subselect.result
@@ -3025,13 +3025,13 @@ FROM t1 WHERE a > '2000-01-01';
SHOW CREATE TABLE t2;
Table Create Table
t2 CREATE TABLE `t2` (
- `sub_a` datetime default NULL
+ `sub_a` datetime DEFAULT NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1
CREATE TABLE t3 AS (SELECT a FROM t1 WHERE a < '2000-01-01') UNION (SELECT a FROM t1 WHERE a > '2000-01-01');
SHOW CREATE TABLE t3;
Table Create Table
t3 CREATE TABLE `t3` (
- `a` datetime default NULL
+ `a` datetime DEFAULT NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1
DROP TABLE t1,t2,t3;
create table t1 (df decimal(5,1));