summaryrefslogtreecommitdiff
path: root/mysql-test/r/func_time.result
diff options
context:
space:
mode:
authorunknown <ramil/ram@mysql.com/myoffice.izhnet.ru>2006-10-17 16:30:49 +0500
committerunknown <ramil/ram@mysql.com/myoffice.izhnet.ru>2006-10-17 16:30:49 +0500
commit4c02f402d48b64c8044832f45845db73b3c9bd9f (patch)
tree9cfa840cb4c5a125046f9f1f74defd0342a3787c /mysql-test/r/func_time.result
parent0ace2b44ba0410e901d18c5315837647c8436c1d (diff)
downloadmariadb-git-4c02f402d48b64c8044832f45845db73b3c9bd9f.tar.gz
Fix for bug #22229: Bug in DATE_ADD()
From the manual: date arithmetic operations require complete dates and do not work with incomplete dates such as '2006-07-00' or badly malformed dates. mysql-test/r/func_time.result: Fix for bug #22229: Bug in DATE_ADD() - test result. mysql-test/t/func_time.test: Fix for bug #22229: Bug in DATE_ADD() - test case. sql/item_timefunc.cc: Fix for bug #22229: Bug in DATE_ADD() - Item_func_str_to_date::get_date() should return NULL if TIME_NO_ZERO_DATE flag is set and year||month||day is 0.
Diffstat (limited to 'mysql-test/r/func_time.result')
-rw-r--r--mysql-test/r/func_time.result3
1 files changed, 3 insertions, 0 deletions
diff --git a/mysql-test/r/func_time.result b/mysql-test/r/func_time.result
index 25c910a711a..9b843858d3f 100644
--- a/mysql-test/r/func_time.result
+++ b/mysql-test/r/func_time.result
@@ -1076,3 +1076,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