diff options
author | unknown <knielsen@knielsen-hq.org> | 2009-11-30 22:37:27 +0100 |
---|---|---|
committer | unknown <knielsen@knielsen-hq.org> | 2009-11-30 22:37:27 +0100 |
commit | db260b19e3edb9e153abf784711a3ae13e40db4a (patch) | |
tree | 4a9d9e50072d36ee917a570f8bf83a0117e971db /mysql-test/t/func_str.test | |
parent | 0df8279c468235f4feaf9eb25aa2beb5032ee1dc (diff) | |
parent | 4a458290441937661136c73afa61393a6634f7b0 (diff) | |
download | mariadb-git-db260b19e3edb9e153abf784711a3ae13e40db4a.tar.gz |
Merge MySQL 5.1.41 into MariaDB trunk, including a number of after-merge fixes.
Also merge charset patch.
Diffstat (limited to 'mysql-test/t/func_str.test')
-rw-r--r-- | mysql-test/t/func_str.test | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/mysql-test/t/func_str.test b/mysql-test/t/func_str.test index 7cb7f7f72d2..66b9eabd385 100644 --- a/mysql-test/t/func_str.test +++ b/mysql-test/t/func_str.test @@ -1291,6 +1291,19 @@ INSERT INTO t1 VALUES ('aaaaaaaa'); SELECT LOAD_FILE(a) FROM t1; DROP TABLE t1; +# +# Bug#46815 CONCAT_WS returning wrong data +# +CREATE TABLE t1 (f2 VARCHAR(20)); +CREATE TABLE t2 (f2 VARCHAR(20)); + +INSERT INTO t1 VALUES ('MIN'),('MAX'); +INSERT INTO t2 VALUES ('LOAD'); + +SELECT CONCAT_WS('_', (SELECT t2.f2 FROM t2), t1.f2) AS concat_name FROM t1; + +DROP TABLE t1, t2; + --echo End of 5.0 tests |