diff options
| author | unknown <monty@mysql.com> | 2005-01-02 23:31:37 +0200 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2005-01-02 23:31:37 +0200 |
| commit | 3652c4edd94af2b0ae0a9f7bb06e58dea7cfdc15 (patch) | |
| tree | 62b7832773783c6552157d38eaea225c22ae0b08 /mysql-test | |
| parent | e1455e4ddda0d2706745172f89f993414bef5a66 (diff) | |
| download | mariadb-git-3652c4edd94af2b0ae0a9f7bb06e58dea7cfdc15.tar.gz | |
Streamlined code for trim, ltrim and rtrim
Portability fixes
mysql-test/r/func_str.result:
Added test for ltrim and rtrim with NULL
mysql-test/t/func_str.test:
Added test for ltrim and rtrim with NULL
sql/item_strfunc.cc:
Streamlined code for trim, ltrim and rtrim
tests/client_test.c:
Fixed wrong usage of %lld (not portable)
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/r/func_str.result | 9 | ||||
| -rw-r--r-- | mysql-test/t/func_str.test | 3 |
2 files changed, 12 insertions, 0 deletions
diff --git a/mysql-test/r/func_str.result b/mysql-test/r/func_str.result index 530651e63f8..2399099b478 100644 --- a/mysql-test/r/func_str.result +++ b/mysql-test/r/func_str.result @@ -48,6 +48,9 @@ tcx.se .se select concat(':',ltrim(' left '),':',rtrim(' right '),':'); concat(':',ltrim(' left '),':',rtrim(' right '),':') :left : right: +select concat(':',trim(leading from ' left '),':',trim(trailing from ' right '),':'); +concat(':',trim(leading from ' left '),':',trim(trailing from ' right '),':') +:left : right: select concat(':',trim(LEADING FROM ' left'),':',trim(TRAILING FROM ' right '),':'); concat(':',trim(LEADING FROM ' left'),':',trim(TRAILING FROM ' right '),':') :left: right: @@ -703,3 +706,9 @@ NULL select trim('xyz' from null) as "must_be_null"; must_be_null NULL +select trim(leading NULL from 'kate') as "must_be_null"; +must_be_null +NULL +select trim(trailing NULL from 'xyz') 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 a5d95332caa..4a1b8470ada 100644 --- a/mysql-test/t/func_str.test +++ b/mysql-test/t/func_str.test @@ -25,6 +25,7 @@ select substring_index('www.tcx.se','tcx',1),substring_index('www.tcx.se','tcx', select substring_index('.tcx.se','.',-2),substring_index('.tcx.se','.tcx',-1); select concat(':',ltrim(' left '),':',rtrim(' right '),':'); +select concat(':',trim(leading from ' left '),':',trim(trailing from ' right '),':'); select concat(':',trim(LEADING FROM ' left'),':',trim(TRAILING FROM ' right '),':'); select concat(':',trim(' m '),':',trim(BOTH FROM ' y '),':',trim('*' FROM '*s*'),':'); select concat(':',trim(BOTH 'ab' FROM 'ababmyabab'),':',trim(BOTH '*' FROM '***sql'),':'); @@ -443,3 +444,5 @@ select quote(trim(concat(' ', 'a'))); # select trim(null from 'kate') as "must_be_null"; select trim('xyz' from null) as "must_be_null"; +select trim(leading NULL from 'kate') as "must_be_null"; +select trim(trailing NULL from 'xyz') as "must_be_null"; |