summaryrefslogtreecommitdiff
path: root/mysql-test/t/date_formats.test
diff options
context:
space:
mode:
authorAlexander Barkov <bar@mnogosearch.org>2014-01-28 13:00:50 +0400
committerAlexander Barkov <bar@mnogosearch.org>2014-01-28 13:00:50 +0400
commit94868914b84bd96ea946fc583862126ab8bda3a0 (patch)
treea68946a384440ffe86e19126899e50cc42250f22 /mysql-test/t/date_formats.test
parent4bf002d6a02943bc94d918216d5dc86f2f00a0de (diff)
parentf189ed5009cfd4149aa90ba18bfc9c80de9f0a39 (diff)
downloadmariadb-git-94868914b84bd96ea946fc583862126ab8bda3a0.tar.gz
merge 5.3 -> 5.5
Diffstat (limited to 'mysql-test/t/date_formats.test')
-rw-r--r--mysql-test/t/date_formats.test2
1 files changed, 2 insertions, 0 deletions
diff --git a/mysql-test/t/date_formats.test b/mysql-test/t/date_formats.test
index 7e6990f4754..972543aefc2 100644
--- a/mysql-test/t/date_formats.test
+++ b/mysql-test/t/date_formats.test
@@ -32,6 +32,8 @@ ORDER BY variable_name;
# SET date_format='%d.%m.%Y';
# SET date_format='%m-%d-%Y';
#
+# --error ER_WRONG_VALUE_FOR_VAR
+# SET datetime_format= NULL;
# set datetime_format= '%Y%m%d%H%i%s';
# set datetime_format= '%Y-%m-%d %H:%i:%s';
# set datetime_format= '%m-%d-%y %H:%i:%s.%f';