diff options
| author | Michael Widenius <monty@askmonty.org> | 2011-02-20 18:51:43 +0200 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2011-02-20 18:51:43 +0200 |
| commit | 58bb0769bdf13a9747e900aa2f0955137738ce9d (patch) | |
| tree | 1b46ea0f72dce27532f0c87c60ba8a1baa453fa0 /mysql-test/r/date_formats.result | |
| parent | 7e497abcfb3e761ba5a368316192ae930fb58f6b (diff) | |
| parent | de3c4428b8c759e85631d8d70b5845c872de5400 (diff) | |
| download | mariadb-git-58bb0769bdf13a9747e900aa2f0955137738ce9d.tar.gz | |
Merge with MySQL 5.1.55
- Fixed some issues with partitions and connection_string, which also fixed lp:716890 "Pre- and post-recovery crash in Aria"
- Fixed wrong assert in Aria
Now need to merge with latest xtradb before pushing
sql/ha_partition.cc:
Ensure that m_ordered_rec_buffer is not freed before close.
sql/mysqld.cc:
Changed to use opt_stack_trace instead of opt_pstack.
Removed references to pstack
sql/partition_element.h:
Ensure that connect_string is initialized
storage/maria/ma_key_recover.c:
Fixed wrong assert
Diffstat (limited to 'mysql-test/r/date_formats.result')
| -rw-r--r-- | mysql-test/r/date_formats.result | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/mysql-test/r/date_formats.result b/mysql-test/r/date_formats.result index 7e185daa668..a919a6f8c5e 100644 --- a/mysql-test/r/date_formats.result +++ b/mysql-test/r/date_formats.result @@ -609,3 +609,17 @@ SELECT DATE_FORMAT("2009-01-01",'%W %d %M %Y') as valid_date; valid_date Thursday 01 January 2009 "End of 5.0 tests" +# +# Start of 5.1 tests +# +# +# Bug#58005 utf8 + get_format causes failed assertion: !str || str != Ptr' +# +SET NAMES utf8; +SELECT LEAST('%', GET_FORMAT(datetime, 'eur'), CAST(GET_FORMAT(datetime, 'eur') AS CHAR(65535))); +LEAST('%', GET_FORMAT(datetime, 'eur'), CAST(GET_FORMAT(datetime, 'eur') AS CHAR(65535))) +% +SET NAMES latin1; +# +# End of 5.1 tests +# |