diff options
| author | Alexey Kopytov <Alexey.Kopytov@sun.com> | 2009-02-05 15:49:59 +0300 |
|---|---|---|
| committer | Alexey Kopytov <Alexey.Kopytov@sun.com> | 2009-02-05 15:49:59 +0300 |
| commit | 4cd0e2fac4ad4c9218f24bb42b299700c2ed777f (patch) | |
| tree | 731e445fc80a65754765e1ece70412fe0dd1c08f /mysql-test | |
| parent | b9d02d4669ad45444f5082979e37908125eea3de (diff) | |
| parent | 759b626d11e4ee6402a510e570ac83864e8844d4 (diff) | |
| download | mariadb-git-4cd0e2fac4ad4c9218f24bb42b299700c2ed777f.tar.gz | |
Merge mysql-5.0-bugteam -> mysql-5.1-bugteam.
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/r/func_str.result | 6 | ||||
| -rw-r--r-- | mysql-test/t/func_str.test | 9 |
2 files changed, 15 insertions, 0 deletions
diff --git a/mysql-test/r/func_str.result b/mysql-test/r/func_str.result index 0824f13cafc..e73d320596d 100644 --- a/mysql-test/r/func_str.result +++ b/mysql-test/r/func_str.result @@ -2519,4 +2519,10 @@ def format(a, 2) 253 49 4 Y 0 31 8 format(a, 2) 1.33 drop table t1; +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; +h i +31.12.2008 AAAAAA, aaaaaa +DROP TABLE t1; End of 5.0 tests 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 |