Commit 7505fc82 authored by evgen@moonbone.local's avatar evgen@moonbone.local
Browse files

Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 

into  moonbone.local:/mnt/gentoo64/work/16377-bug-5.0-opt-mysql
parents 224bb6c4 4382bf72

mysql-test/r/type_datetime.result

+7 −9
Original line number Diff line number Diff line
@@ -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');

mysql-test/t/type_datetime.test

+1 −3
Original line number Diff line number Diff line
@@ -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;



#