diff options
| author | unknown <evgen@moonbone.local> | 2007-04-29 20:26:57 +0400 |
|---|---|---|
| committer | unknown <evgen@moonbone.local> | 2007-04-29 20:26:57 +0400 |
| commit | ba967f5b43dd1bb0f303bdeee55aeb630ea829a7 (patch) | |
| tree | d3225b0626570df659003a0acf497a042bc20a75 | |
| parent | ad42991306a14ec10170652e82c252de023b523c (diff) | |
| parent | d4b1b8133f8925293b6dbebe2ae2681b1e8097c8 (diff) | |
| download | mariadb-git-ba967f5b43dd1bb0f303bdeee55aeb630ea829a7.tar.gz | |
Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
into moonbone.local:/mnt/gentoo64/work/16377-bug-5.0-opt-mysql
| -rw-r--r-- | mysql-test/r/type_datetime.result | 16 | ||||
| -rw-r--r-- | mysql-test/t/type_datetime.test | 4 |
2 files changed, 8 insertions, 12 deletions
diff --git a/mysql-test/r/type_datetime.result b/mysql-test/r/type_datetime.result index f5ff3369c8b..3a28410b7dc 100644 --- a/mysql-test/r/type_datetime.result +++ b/mysql-test/r/type_datetime.result @@ -221,15 +221,13 @@ f1 f2 select 1 from dual where cast('2001-1-1 2:3:4' as date) = cast('2001-01-01' as datetime); 1 1 -select f1, f2, UNIX_TIMESTAMP(f2), UNIX_TIMESTAMP(f1), -f1 > f2, f1 = f2, f1 < f2 -from t1; -f1 f2 UNIX_TIMESTAMP(f2) UNIX_TIMESTAMP(f1) f1 > f2 f1 = f2 f1 < f2 -2001-01-01 2001-01-01 01:01:01 978300061 978296400 0 0 1 -2001-02-05 2001-02-05 00:00:00 981320400 981320400 0 1 0 -2001-03-10 2001-03-09 01:01:01 984088861 984171600 1 0 0 -2001-04-15 2001-04-15 00:00:00 987282000 987282000 0 1 0 -2001-05-20 2001-05-20 01:01:01 990309661 990306000 0 0 1 +select f1, f2, f1 > f2, f1 = f2, f1 < f2 from t1; +f1 f2 f1 > f2 f1 = f2 f1 < f2 +2001-01-01 2001-01-01 01:01:01 0 0 1 +2001-02-05 2001-02-05 00:00:00 0 1 0 +2001-03-10 2001-03-09 01:01:01 1 0 0 +2001-04-15 2001-04-15 00:00:00 0 1 0 +2001-05-20 2001-05-20 01:01:01 0 0 1 drop table t1; create table t1 (f1 date, f2 datetime, f3 timestamp); insert into t1 values('2001-01-01','2001-01-01 01:01:01','2001-01-01 01:01:01'); diff --git a/mysql-test/t/type_datetime.test b/mysql-test/t/type_datetime.test index 2c38b3ea9e3..fc7b20d77a4 100644 --- a/mysql-test/t/type_datetime.test +++ b/mysql-test/t/type_datetime.test @@ -157,9 +157,7 @@ select f1, f3 from t1 where f1 >= '2001-02-05 00:00:00' and f3 <= '2001-04-15'; select f1, f3 from t1 where f1 >= '2001-2-5 0:0:0' and f2 <= '2001-4-15'; select f1, f2 from t1 where if(1, f1, 0) >= f2; select 1 from dual where cast('2001-1-1 2:3:4' as date) = cast('2001-01-01' as datetime); -select f1, f2, UNIX_TIMESTAMP(f2), UNIX_TIMESTAMP(f1), - f1 > f2, f1 = f2, f1 < f2 - from t1; +select f1, f2, f1 > f2, f1 = f2, f1 < f2 from t1; drop table t1; # |