summaryrefslogtreecommitdiff
path: root/mysql-test/r/date_formats.result
diff options
context:
space:
mode:
authorAlexander Barkov <bar@mysql.com>2010-11-12 13:20:58 +0300
committerAlexander Barkov <bar@mysql.com>2010-11-12 13:20:58 +0300
commit46aad8cf1eabd1251838e4f3782148be0ed55de7 (patch)
treeb6279f952a4629962e1e4a6d5d1f33fe71b1d270 /mysql-test/r/date_formats.result
parentbd165aa4f02997f193e6d65ccd536a3e2ae6680f (diff)
parent1b583fa5da71a764dd66ad8b3668d7c75b122444 (diff)
downloadmariadb-git-46aad8cf1eabd1251838e4f3782148be0ed55de7.tar.gz
Merging from mysql-5.1-security
Diffstat (limited to 'mysql-test/r/date_formats.result')
-rw-r--r--mysql-test/r/date_formats.result14
1 files changed, 14 insertions, 0 deletions
diff --git a/mysql-test/r/date_formats.result b/mysql-test/r/date_formats.result
index 432b9b14a85..b6081d34f37 100644
--- a/mysql-test/r/date_formats.result
+++ b/mysql-test/r/date_formats.result
@@ -544,3 +544,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
+#