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/r/timezone2.result | |
| 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/r/timezone2.result')
| -rw-r--r-- | mysql-test/r/timezone2.result | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/mysql-test/r/timezone2.result b/mysql-test/r/timezone2.result index 70f5ef9edc1..0ac4ddca277 100644 --- a/mysql-test/r/timezone2.result +++ b/mysql-test/r/timezone2.result @@ -326,5 +326,11 @@ NULL Warnings: Warning 1292 Incorrect datetime value: '00:00:00' # +# MDEV-5506 safe_mutex: Trying to lock unitialized mutex at safemalloc.c on server shutdown after SELECT with CONVERT_TZ +# +SELECT CONVERT_TZ('2001-10-08 00:00:00', MAKE_SET(0,'+01:00'), '+00:00' ); +CONVERT_TZ('2001-10-08 00:00:00', MAKE_SET(0,'+01:00'), '+00:00' ) +NULL +# # End of 5.3 tests # |