summaryrefslogtreecommitdiff
path: root/mysql-test/t/func_str.test
diff options
context:
space:
mode:
authorAlexey Kopytov <Alexey.Kopytov@sun.com>2009-02-13 19:20:56 +0300
committerAlexey Kopytov <Alexey.Kopytov@sun.com>2009-02-13 19:20:56 +0300
commitdd35a152f91cdb5790619fc3cbc0cfbc09666f5f (patch)
treee907d3bf6c88897a516896d7cc9dac08985f5907 /mysql-test/t/func_str.test
parentbdbe393db1b55cbde9aa4ca66cc551b57dad7f1f (diff)
parent9373b1b88031a9bf4ef7fb1a42680c9f98f837f4 (diff)
downloadmariadb-git-dd35a152f91cdb5790619fc3cbc0cfbc09666f5f.tar.gz
Merge mysql-5.0-bugteam -> mysql-5.1-bugteam.
Diffstat (limited to 'mysql-test/t/func_str.test')
-rw-r--r--mysql-test/t/func_str.test9
1 files changed, 9 insertions, 0 deletions
diff --git a/mysql-test/t/func_str.test b/mysql-test/t/func_str.test
index 5d77c678d52..b71dbe91467 100644
--- a/mysql-test/t/func_str.test
+++ b/mysql-test/t/func_str.test
@@ -1273,4 +1273,13 @@ select format(a, 2) from t1;
--disable_metadata
drop table t1;
+#
+# Bug #41868: crash or memory overrun with concat + upper, date_format functions
+#
+
+CREATE TABLE t1 (c DATE, aa VARCHAR(30));
+INSERT INTO t1 VALUES ('2008-12-31','aaaaaa');
+SELECT DATE_FORMAT(c, GET_FORMAT(DATE, 'eur')) h, CONCAT(UPPER(aa),', ', aa) i FROM t1;
+DROP TABLE t1;
+
--echo End of 5.0 tests