diff options
| author | Alexander Barkov <bar@mnogosearch.org> | 2014-01-28 13:00:50 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mnogosearch.org> | 2014-01-28 13:00:50 +0400 |
| commit | 94868914b84bd96ea946fc583862126ab8bda3a0 (patch) | |
| tree | a68946a384440ffe86e19126899e50cc42250f22 /mysql-test | |
| parent | 4bf002d6a02943bc94d918216d5dc86f2f00a0de (diff) | |
| parent | f189ed5009cfd4149aa90ba18bfc9c80de9f0a39 (diff) | |
| download | mariadb-git-94868914b84bd96ea946fc583862126ab8bda3a0.tar.gz | |
merge 5.3 -> 5.5
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/r/timezone2.result | 6 | ||||
| -rw-r--r-- | mysql-test/t/date_formats.test | 2 | ||||
| -rw-r--r-- | mysql-test/t/timezone2.test | 6 |
3 files changed, 14 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 # 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'; 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 # |