diff options
author | unknown <ramil/ram@myoffice.izhnet.ru> | 2006-11-29 09:42:59 +0400 |
---|---|---|
committer | unknown <ramil/ram@myoffice.izhnet.ru> | 2006-11-29 09:42:59 +0400 |
commit | b15425adb9166d3f290af7dbea20fcd5839844c7 (patch) | |
tree | e59624f32ca030054ce59b0f3ef1086ad8f2ec9b /mysql-test/t/func_time.test | |
parent | 4a488c06ed25e0123a084af49130b0ba35acd1f8 (diff) | |
parent | 4c02f402d48b64c8044832f45845db73b3c9bd9f (diff) | |
download | mariadb-git-b15425adb9166d3f290af7dbea20fcd5839844c7.tar.gz |
Merge mysql.com:/usr/home/ram/work/bug22229/my50-bug22229
into mysql.com:/usr/home/ram/work/bug22229/my51-bug22229
sql/item_timefunc.cc:
Auto merged
mysql-test/r/func_time.result:
SCCS merged
mysql-test/t/func_time.test:
SCCS merged
Diffstat (limited to 'mysql-test/t/func_time.test')
-rw-r--r-- | mysql-test/t/func_time.test | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/mysql-test/t/func_time.test b/mysql-test/t/func_time.test index a0b0a929b6a..55472db9b3d 100644 --- a/mysql-test/t/func_time.test +++ b/mysql-test/t/func_time.test @@ -653,6 +653,12 @@ DROP TABLE t1,t2; # Restore timezone to default set time_zone= @@global.time_zone; + +# +# Bug #22229: bug in DATE_ADD() +# + +select str_to_date('10:00 PM', '%h:%i %p') + INTERVAL 10 MINUTE; --echo End of 5.0 tests # |