diff options
| author | unknown <Kristofer.Pettersson@naruto.> | 2006-10-04 13:17:28 +0200 |
|---|---|---|
| committer | unknown <Kristofer.Pettersson@naruto.> | 2006-10-04 13:17:28 +0200 |
| commit | 910fe3921e8ba8a4562d5e9d318769e16babb110 (patch) | |
| tree | 01ec0e4d97d83ee738038bcaca318b4b165cce6a /mysql-test/r/func_time.result | |
| parent | 54886b08cc95cff63a7077b2168a53fd9d52dc5c (diff) | |
| parent | 5e71afcbe79091f9113e66e161cb15c3c35f3f67 (diff) | |
| download | mariadb-git-910fe3921e8ba8a4562d5e9d318769e16babb110.tar.gz | |
Merge naruto.:C:/cpp/bug21811/my50-bug21811
into naruto.:C:/cpp/bug21811/my51-bug21811
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 cfb675652f2..df1d589c30e 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 |