summaryrefslogtreecommitdiff
path: root/mysql-test/t/date_formats.test
diff options
context:
space:
mode:
authorAlexander Barkov <bar@mnogosearch.org>2014-01-28 12:25:29 +0400
committerAlexander Barkov <bar@mnogosearch.org>2014-01-28 12:25:29 +0400
commitf189ed5009cfd4149aa90ba18bfc9c80de9f0a39 (patch)
tree04d87fca2479c120dac118eba46a2c03dc30004a /mysql-test/t/date_formats.test
parent7ea9d1e692c69c8715d98a9dbc44289d47a65447 (diff)
downloadmariadb-git-f189ed5009cfd4149aa90ba18bfc9c80de9f0a39.tar.gz
MDEV-5506 safe_mutex: Trying to lock unitialized mutex at safemalloc.c
on server shutdown after SELECT with CONVERT_TZ It's wrong to return my_empty_string from val_str(). Removing my_empty_string. Using make_empty_result() instead.
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 55e08e420b1..81cd125d750 100644
--- a/mysql-test/t/date_formats.test
+++ b/mysql-test/t/date_formats.test
@@ -32,6 +32,8 @@ SET date_format='%Y.%m.%d';
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';