diff options
| author | Alexander Barkov <bar@mnogosearch.org> | 2014-01-27 15:05:23 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mnogosearch.org> | 2014-01-27 15:05:23 +0400 |
| commit | 0ad8eaeb56a049df2947516d3d7ec49301d8d09d (patch) | |
| tree | 151f9c4560a15f39d039061a4877e8775b6dc792 /mysql-test/r/type_time.result | |
| parent | ba3d0b173a5610905b31b78367c50700e8032b0b (diff) | |
| parent | 7ea9d1e692c69c8715d98a9dbc44289d47a65447 (diff) | |
| download | mariadb-git-0ad8eaeb56a049df2947516d3d7ec49301d8d09d.tar.gz | |
Merge 5.3 -> 5.5
Diffstat (limited to 'mysql-test/r/type_time.result')
| -rw-r--r-- | mysql-test/r/type_time.result | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/r/type_time.result b/mysql-test/r/type_time.result index bdbfba84994..ef02368e375 100644 --- a/mysql-test/r/type_time.result +++ b/mysql-test/r/type_time.result @@ -181,7 +181,7 @@ SELECT CONVERT_TZ(GREATEST(TIME('00:00:00'),TIME('00:00:00')),'+00:00','+7:5'); CONVERT_TZ(GREATEST(TIME('00:00:00'),TIME('00:00:00')),'+00:00','+7:5') NULL Warnings: -Warning 1292 Incorrect datetime value: '0000-00-00 00:00:00' +Warning 1292 Incorrect datetime value: '00:00:00' # # MDEV-4652 Wrong result for CONCAT(GREATEST(TIME('00:00:01'),TIME('00:00:00'))) # |