diff options
author | unknown <monty@donna.mysql.com> | 2001-01-19 05:08:59 +0200 |
---|---|---|
committer | unknown <monty@donna.mysql.com> | 2001-01-19 05:08:59 +0200 |
commit | 9223381f9c85297d7548f99e7ea7cd6c157e763a (patch) | |
tree | 453a52849923a70f0b3746c768caf005b7d3fa72 /mysql-test | |
parent | 5e5cd0f87e3940367faf54d2bdd9ddffe8bdecde (diff) | |
parent | 67891255f5d99c36832e54373fabfcfa758aa979 (diff) | |
download | mariadb-git-9223381f9c85297d7548f99e7ea7cd6c157e763a.tar.gz |
merge
BitKeeper/etc/logging_ok:
Logging to logging@openlogging.org accepted
Diffstat (limited to 'mysql-test')
-rw-r--r-- | mysql-test/r/func_str.result | 2 | ||||
-rw-r--r-- | mysql-test/t/func_str.test | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/mysql-test/r/func_str.result b/mysql-test/r/func_str.result index aac051d00fa..c1a0c288562 100644 --- a/mysql-test/r/func_str.result +++ b/mysql-test/r/func_str.result @@ -32,6 +32,8 @@ concat(':',trim(BOTH 'ab' FROM 'ababmyabab'),':',trim(BOTH '*' FROM '***sql'),': :my:sql: concat(':',trim(LEADING '.*' FROM '.*my'),':',trim(TRAILING '.*' FROM 'sql.*.*'),':') :my:sql: +TRIM("foo" FROM "foo") TRIM("foo" FROM "foook") TRIM("foo" FROM "okfoo") + ok ok insert('txs',2,1,'hi') insert('is ',4,0,'a') insert('txxxxt',2,4,'es') this is a test replace('aaaa','a','b') replace('aaaa','aa','b') replace('aaaa','a','bb') replace('aaaa','','b') replace('bbbb','a','c') diff --git a/mysql-test/t/func_str.test b/mysql-test/t/func_str.test index 51af2766dae..d4211868790 100644 --- a/mysql-test/t/func_str.test +++ b/mysql-test/t/func_str.test @@ -22,6 +22,7 @@ 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'),':'); select concat(':',trim(LEADING '.*' FROM '.*my'),':',trim(TRAILING '.*' FROM 'sql.*.*'),':'); +select TRIM("foo" FROM "foo"), TRIM("foo" FROM "foook"), TRIM("foo" FROM "okfoo"); select insert('txs',2,1,'hi'),insert('is ',4,0,'a'),insert('txxxxt',2,4,'es'); select replace('aaaa','a','b'),replace('aaaa','aa','b'),replace('aaaa','a','bb'),replace('aaaa','','b'),replace('bbbb','a','c'); |