diff options
| author | unknown <Kristofer.Pettersson@naruto.> | 2006-10-11 11:05:55 +0200 |
|---|---|---|
| committer | unknown <Kristofer.Pettersson@naruto.> | 2006-10-11 11:05:55 +0200 |
| commit | e67e4e4c780b8c8aee87a88ff9061d92b3a5f8b0 (patch) | |
| tree | c6fdc3c8f0c635d61d68059b960c1a2c6cd47274 /mysql-test/r/func_time.result | |
| parent | da0b4e97430fb4c49bf1a934c893e7d3e3351e02 (diff) | |
| parent | c247bf9dc3c370c70dc763dcf361c85ee20035fd (diff) | |
| download | mariadb-git-e67e4e4c780b8c8aee87a88ff9061d92b3a5f8b0.tar.gz | |
Merge naruto.:C:/cpp/bug21811/my51-bug21811
into naruto.:C:/cpp/mysql-5.1-new-maint
include/my_time.h:
Auto merged
mysql-test/r/func_time.result:
Auto merged
sql/item_timefunc.cc:
Auto merged
Diffstat (limited to 'mysql-test/r/func_time.result')
| -rw-r--r-- | mysql-test/r/func_time.result | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/r/func_time.result b/mysql-test/r/func_time.result index 82c361edd39..93158750b89 100644 --- a/mysql-test/r/func_time.result +++ b/mysql-test/r/func_time.result @@ -612,7 +612,7 @@ date_add(date,INTERVAL "1 1:1:1" DAY_SECOND) 2003-01-03 01:01:01 select date_add(date,INTERVAL "1" WEEK) from t1; date_add(date,INTERVAL "1" WEEK) -2003-01-09 00:00:00 +2003-01-09 select date_add(date,INTERVAL "1" QUARTER) from t1; date_add(date,INTERVAL "1" QUARTER) 2003-04-02 @@ -621,7 +621,7 @@ timestampadd(MINUTE, 1, date) 2003-01-02 00:01:00 select timestampadd(WEEK, 1, date) from t1; timestampadd(WEEK, 1, date) -2003-01-09 00:00:00 +2003-01-09 select timestampadd(SQL_TSI_SECOND, 1, date) from t1; timestampadd(SQL_TSI_SECOND, 1, date) 2003-01-02 00:00:01 |