diff options
| author | unknown <jimw@mysql.com> | 2005-02-02 08:21:11 -0800 |
|---|---|---|
| committer | unknown <jimw@mysql.com> | 2005-02-02 08:21:11 -0800 |
| commit | 33e74b1427c1e211acc1f06e0384e44bd1edac24 (patch) | |
| tree | f7feeb6b7dbdf2dd8b64422121decec13f0ae311 /mysql-test | |
| parent | 6b6e5d4a1612b2c80d5c5f71c3b0ba0ce19d3cc0 (diff) | |
| parent | 22f839cdd23475075e0f1e9eeeb3c7201f9a4262 (diff) | |
| download | mariadb-git-33e74b1427c1e211acc1f06e0384e44bd1edac24.tar.gz | |
Merge fixes for #8248, #5569.
mysql-test/r/func_str.result:
Update results
mysql-test/t/func_str.test:
Merge test
sql/item_strfunc.cc:
Set charset on output string
sql/item_strfunc.h:
Merge
sql/sql_parse.cc:
Merge
vio/viosocket.c:
Merge
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/r/func_str.result | 7 | ||||
| -rw-r--r-- | mysql-test/t/func_str.test | 11 |
2 files changed, 18 insertions, 0 deletions
diff --git a/mysql-test/r/func_str.result b/mysql-test/r/func_str.result index 58d66c7f712..a8a7ad0e349 100644 --- a/mysql-test/r/func_str.result +++ b/mysql-test/r/func_str.result @@ -697,6 +697,13 @@ quote(ltrim(concat(' ', 'a'))) select quote(trim(concat(' ', 'a'))); quote(trim(concat(' ', 'a'))) 'a' +CREATE TABLE t1 SELECT 1 UNION SELECT 2 UNION SELECT 3; +SELECT QUOTE('A') FROM t1; +QUOTE('A') +'A' +'A' +'A' +DROP TABLE t1; select trim(null from 'kate') as "must_be_null"; must_be_null NULL diff --git a/mysql-test/t/func_str.test b/mysql-test/t/func_str.test index 34bbb2bab0f..2bf130d1538 100644 --- a/mysql-test/t/func_str.test +++ b/mysql-test/t/func_str.test @@ -195,6 +195,17 @@ select trim(trailing 'foo' from 'foo'); select trim(leading 'foo' from 'foo'); # +# crashing bug with QUOTE() and LTRIM() or TRIM() fixed +# Bug #7495 +# + +select quote(ltrim(concat(' ', 'a'))); +select quote(trim(concat(' ', 'a'))); + +# Bad results from QUOTE(). Bug #8248 +CREATE TABLE t1 SELECT 1 UNION SELECT 2 UNION SELECT 3; +SELECT QUOTE('A') FROM t1; +DROP TABLE t1; # Test collation and coercibility # |