summaryrefslogtreecommitdiff
path: root/mysql-test
diff options
context:
space:
mode:
authorram@mysql.r18.ru <>2003-01-03 19:47:58 +0400
committerram@mysql.r18.ru <>2003-01-03 19:47:58 +0400
commit74a9fb244a118180eac72806770ac6ba57a01419 (patch)
treeea4c1e57326a3ef2930302ae80d2448a20d12474 /mysql-test
parent9a64d3a17c9a7a47d97cbab233679ee30f9c2a0e (diff)
parent8009c16a34f5e0d33b34c0cc34c82037fbeebbae (diff)
downloadmariadb-git-74a9fb244a118180eac72806770ac6ba57a01419.tar.gz
Merge rkalimullin@work.mysql.com:/home/bk/mysql-4.0
into mysql.r18.ru:/usr/home/ram/work/mysql-4.0
Diffstat (limited to 'mysql-test')
-rw-r--r--mysql-test/r/func_str.result3
-rw-r--r--mysql-test/t/func_str.test1
2 files changed, 4 insertions, 0 deletions
diff --git a/mysql-test/r/func_str.result b/mysql-test/r/func_str.result
index 69e37d7b911..9e8f2b90f07 100644
--- a/mysql-test/r/func_str.result
+++ b/mysql-test/r/func_str.result
@@ -155,6 +155,9 @@ quote(concat('abc\'', '\\cba'))
select quote(1/0), quote('\0\Z');
quote(1/0) quote('\0\Z')
NULL '\0\Z'
+select length(quote(concat(char(0),"test")));
+length(quote(concat(char(0),"test")))
+8
select reverse("");
reverse("")
diff --git a/mysql-test/t/func_str.test b/mysql-test/t/func_str.test
index 717b9c86a07..f95cd901dfb 100644
--- a/mysql-test/t/func_str.test
+++ b/mysql-test/t/func_str.test
@@ -64,6 +64,7 @@ select decode(encode("abcdef","monty"),"monty")="abcdef";
select quote('\'\"\\test');
select quote(concat('abc\'', '\\cba'));
select quote(1/0), quote('\0\Z');
+select length(quote(concat(char(0),"test")));
#
# Wrong usage of functions