summaryrefslogtreecommitdiff
path: root/mysql-test/t/date_formats.test
diff options
context:
space:
mode:
authorunknown <ramil/ram@mysql.com/myoffice.izhnet.ru>2006-11-22 09:19:51 +0400
committerunknown <ramil/ram@mysql.com/myoffice.izhnet.ru>2006-11-22 09:19:51 +0400
commit8473844792f5b206d9828bb1e195a2188ea4e63e (patch)
tree6eee0f1c03ad74c3139d08b3729ff09f41d2959b /mysql-test/t/date_formats.test
parentd3144a9d6c5aa07b07568cd0d1d808cc9b9b9d89 (diff)
parent89a4a3e92c91a403740f1f2cdd057ab63afeef46 (diff)
downloadmariadb-git-8473844792f5b206d9828bb1e195a2188ea4e63e.tar.gz
Merge mysql.com:/usr/home/ram/work/bug22029/my41-bug22029
into mysql.com:/usr/home/ram/work/bug22029/my50-bug22029 mysql-test/r/date_formats.result: Auto merged mysql-test/t/date_formats.test: Auto merged sql/item_timefunc.cc: merging
Diffstat (limited to 'mysql-test/t/date_formats.test')
-rw-r--r--mysql-test/t/date_formats.test8
1 files changed, 8 insertions, 0 deletions
diff --git a/mysql-test/t/date_formats.test b/mysql-test/t/date_formats.test
index a81487d273d..3054ec53faa 100644
--- a/mysql-test/t/date_formats.test
+++ b/mysql-test/t/date_formats.test
@@ -326,4 +326,12 @@ SELECT TIME_FORMAT("25:00:00", '%l %p');
#
SELECT DATE_FORMAT('%Y-%m-%d %H:%i:%s', 1151414896);
+#
+# Bug #22029: str_to_date returning NULL
+#
+
+select str_to_date('04 /30/2004', '%m /%d/%Y');
+select str_to_date('04/30 /2004', '%m /%d /%Y');
+select str_to_date('04/30/2004 ', '%m/%d/%Y ');
+
--echo "End of 4.1 tests"