diff options
author | Alexander Barkov <bar@mnogosearch.org> | 2014-01-28 12:25:29 +0400 |
---|---|---|
committer | Alexander Barkov <bar@mnogosearch.org> | 2014-01-28 12:25:29 +0400 |
commit | f189ed5009cfd4149aa90ba18bfc9c80de9f0a39 (patch) | |
tree | 04d87fca2479c120dac118eba46a2c03dc30004a /mysql-test/t/timezone2.test | |
parent | 7ea9d1e692c69c8715d98a9dbc44289d47a65447 (diff) | |
download | mariadb-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/timezone2.test')
-rw-r--r-- | mysql-test/t/timezone2.test | 6 |
1 files changed, 6 insertions, 0 deletions
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 @@ -298,5 +298,11 @@ 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 # |