1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge bk-internal:/home/bk/mysql-4.0/

Browse Source 
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
This commit is contained in:
unknown 2003-08-06 16:52:47 +02:00
commit 3ee893cc3d
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/r/type_date.result
View File

@ -32,6 +32,8 @@ datum
2000-01-02 2000-01-02
2000-01-03 2000-01-03
2000-01-04 2000-01-04
SELECT * FROM t1 WHERE datum BETWEEN "2000-1-2" AND datum - INTERVAL 100 DAY;
datum
DROP TABLE t1; DROP TABLE t1;
CREATE TABLE t1 ( CREATE TABLE t1 (
user_id char(10), user_id char(10),

1
mysql-test/t/type_date.test
View File

@ -34,6 +34,7 @@ INSERT INTO t1 VALUES ( "2000-1-3" );
INSERT INTO t1 VALUES ( "2000-1-4" ); INSERT INTO t1 VALUES ( "2000-1-4" );
INSERT INTO t1 VALUES ( "2000-1-5" ); INSERT INTO t1 VALUES ( "2000-1-5" );
SELECT * FROM t1 WHERE datum BETWEEN "2000-1-2" AND "2000-1-4"; SELECT * FROM t1 WHERE datum BETWEEN "2000-1-2" AND "2000-1-4";
SELECT * FROM t1 WHERE datum BETWEEN "2000-1-2" AND datum - INTERVAL 100 DAY;
DROP TABLE t1; DROP TABLE t1;
# #

10
sql/item_timefunc.cc
View File

@ -1058,14 +1058,12 @@ String *Item_date_add_interval::val_str(String *str)
longlong Item_date_add_interval::val_int() longlong Item_date_add_interval::val_int()
{ {
TIME ltime; TIME ltime;
longlong date;
if (Item_date_add_interval::get_date(&ltime,0)) if (Item_date_add_interval::get_date(&ltime,0))
return (longlong) 0; return (longlong) 0;
return ((longlong) (((ulong) ltime.year)*10000L+ date = (ltime.year*100L + ltime.month)*100L + ltime.day;
(((uint) ltime.month)*100+ return ltime.time_type == TIMESTAMP_DATE ? date :
(uint) ltime.day))*(longlong) 1000000L+ ((date*100L + ltime.hour)*100L+ ltime.minute)*100L + ltime.second;
(longlong) ((ulong) ((uint) ltime.hour)*10000L+
(ulong) (((uint)ltime.minute)*100L+
(uint) ltime.second)));
} }
void Item_extract::fix_length_and_dec() void Item_extract::fix_length_and_dec()