Merge rkalimullin@work.mysql.com:/home/bk/mysql-4.0

into ram.(none):/home/ram/work/mysql-4.0

mysql-test/r/func_str.result

@@ -146,6 +146,12 @@ decode(encode(repeat("a",100000),"monty"),"monty")=repeat("a",100000)
 select decode(encode("abcdef","monty"),"monty")="abcdef";
 decode(encode("abcdef","monty"),"monty")="abcdef"
 1
+select quote('\'\"\\test');
+quote('\'\"\\test')
+'\'\"\\test'
+select quote(concat('abc\'', '\\cba'));
+quote(concat('abc\'', '\\cba'))
+'abc\'\\cba'
 select reverse("");
 reverse("")
 

mysql-test/t/func_str.test

@@ -61,6 +61,9 @@ select least(1,2,3) | greatest(16,32,8), least(5,4)*1,greatest(-1.0,1.0)*1,least
 select decode(encode(repeat("a",100000),"monty"),"monty")=repeat("a",100000);
 select decode(encode("abcdef","monty"),"monty")="abcdef";
 
+select quote('\'\"\\test');
+select quote(concat('abc\'', '\\cba'));
+
 #
 # Wrong usage of functions
 #