From f189ed5009cfd4149aa90ba18bfc9c80de9f0a39 Mon Sep 17 00:00:00 2001 From: Alexander Barkov Date: Tue, 28 Jan 2014 12:25:29 +0400 Subject: 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. --- mysql-test/t/date_formats.test | 2 ++ mysql-test/t/timezone2.test | 6 ++++++ 2 files changed, 8 insertions(+) (limited to 'mysql-test/t') 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'; diff --git a/mysql-test/t/timezone2.test b/mysql-test/t/timezone2.test index 7764b39bf33..2d61c7631f2 100644 --- a/mysql-test/t/timezone2.test +++ b/mysql-test/t/timezone2.test @@ -297,6 +297,12 @@ DROP TABLE t1; SELECT CONVERT_TZ(TIME('00:00:00'),'+00:00','+7:5'); SELECT CONVERT_TZ(TIME('2010-01-01 00:00:00'),'+00:00','+7:5'); +--echo # +--echo # MDEV-5506 safe_mutex: Trying to lock unitialized mutex at safemalloc.c on server shutdown after SELECT with CONVERT_TZ +--echo # +SELECT CONVERT_TZ('2001-10-08 00:00:00', MAKE_SET(0,'+01:00'), '+00:00' ); + + --echo # --echo # End of 5.3 tests --echo # -- cgit v1.2.1