diff options
| author | unknown <ramil/ram@mysql.com/myoffice.izhnet.ru> | 2006-11-29 13:41:03 +0400 |
|---|---|---|
| committer | unknown <ramil/ram@mysql.com/myoffice.izhnet.ru> | 2006-11-29 13:41:03 +0400 |
| commit | 89d106c1a4efad141e7850373335482ad46aeec5 (patch) | |
| tree | de285bb64dc43d94e766f6ade674eb9180dd4d71 /mysql-test | |
| parent | a5aa9f64fe99aab251c5cbcdc8ca3d1e2c5ff40e (diff) | |
| parent | 4c02f402d48b64c8044832f45845db73b3c9bd9f (diff) | |
| download | mariadb-git-89d106c1a4efad141e7850373335482ad46aeec5.tar.gz | |
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
into mysql.com:/usr/home/ram/work/bug22229/my50-bug22229
mysql-test/r/func_time.result:
Auto merged
mysql-test/t/func_time.test:
Auto merged
sql/item_timefunc.cc:
Auto merged
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/r/func_time.result | 3 | ||||
| -rw-r--r-- | mysql-test/t/func_time.test | 6 |
2 files changed, 9 insertions, 0 deletions
diff --git a/mysql-test/r/func_time.result b/mysql-test/r/func_time.result index 1e5c01be288..45c05f0b5b5 100644 --- a/mysql-test/r/func_time.result +++ b/mysql-test/r/func_time.result @@ -1204,3 +1204,6 @@ fmtddate field2 Sep-4 12:00AM abcd DROP TABLE testBug8868; SET NAMES DEFAULT; +select str_to_date('10:00 PM', '%h:%i %p') + INTERVAL 10 MINUTE; +str_to_date('10:00 PM', '%h:%i %p') + INTERVAL 10 MINUTE +NULL diff --git a/mysql-test/t/func_time.test b/mysql-test/t/func_time.test index b0c2c50d4d1..a69cbb67c5b 100644 --- a/mysql-test/t/func_time.test +++ b/mysql-test/t/func_time.test @@ -707,3 +707,9 @@ SELECT DATE_FORMAT(field1,'%b-%e %l:%i%p') as fmtddate, field2 FROM testBug8868; DROP TABLE testBug8868; SET NAMES DEFAULT; + +# +# Bug #22229: bug in DATE_ADD() +# + +select str_to_date('10:00 PM', '%h:%i %p') + INTERVAL 10 MINUTE; |