summaryrefslogtreecommitdiff
path: root/mysql-test/r/func_test.result
diff options
context:
space:
mode:
authormonty@mashka.mysql.fi <>2003-08-19 00:08:08 +0300
committermonty@mashka.mysql.fi <>2003-08-19 00:08:08 +0300
commit4f7512160bfd467e5d53c3e133e1842fac2737ce (patch)
treedf4f8c8cf4d399e322333c5516d5c19507b1fda8 /mysql-test/r/func_test.result
parent2263e3e51faba531a0a7055dbf706a6a8719ad70 (diff)
downloadmariadb-git-4f7512160bfd467e5d53c3e133e1842fac2737ce.tar.gz
After merge fixes
Use server character set if --default-character-set is not used Added convert_string() for more efficient alloc+character-set convert of strings
Diffstat (limited to 'mysql-test/r/func_test.result')
-rw-r--r--mysql-test/r/func_test.result28
1 files changed, 14 insertions, 14 deletions
diff --git a/mysql-test/r/func_test.result b/mysql-test/r/func_test.result
index 9ae7b0c3ef1..e3a0d066a85 100644
--- a/mysql-test/r/func_test.result
+++ b/mysql-test/r/func_test.result
@@ -52,6 +52,20 @@ select 10 % 7, 10 mod 7, 10 div 3;
select (1 << 64)-1, ((1 << 64)-1) DIV 1, ((1 << 64)-1) DIV 2;
(1 << 64)-1 ((1 << 64)-1) DIV 1 ((1 << 64)-1) DIV 2
18446744073709551615 18446744073709551615 9223372036854775807
+create table t1 (a int);
+insert t1 values (1);
+select * from t1 where 1 xor 1;
+a
+drop table t1;
+select 5 between 0 and 10 between 0 and 1,(5 between 0 and 10) between 0 and 1;
+5 between 0 and 10 between 0 and 1 (5 between 0 and 10) between 0 and 1
+0 1
+select 1 and 2 between 2 and 10, 2 between 2 and 10 and 1;
+1 and 2 between 2 and 10 2 between 2 and 10 and 1
+1 1
+select 1 and 0 or 2, 2 or 1 and 0;
+1 and 0 or 2 2 or 1 and 0
+1 1
select _koi8r'a' = _koi8r'A';
_koi8r'a' = _koi8r'A'
1
@@ -109,17 +123,3 @@ select _koi8r'a' COLLATE koi8r_general_ci LIKE _koi8r'A' COLLATE koi8r_bin;
ERROR HY000: Illegal mix of collations (koi8r_general_ci,EXPLICIT) and (koi8r_bin,EXPLICIT) for operation 'like'
select _koi8r'a' LIKE _latin1'A';
ERROR HY000: Illegal mix of collations (koi8r_general_ci,COERCIBLE) and (latin1_swedish_ci,COERCIBLE) for operation 'like'
-create table t1 (a int);
-insert t1 values (1);
-select * from t1 where 1 xor 1;
-a
-drop table t1;
-select 5 between 0 and 10 between 0 and 1,(5 between 0 and 10) between 0 and 1;
-5 between 0 and 10 between 0 and 1 (5 between 0 and 10) between 0 and 1
-0 1
-select 1 and 2 between 2 and 10, 2 between 2 and 10 and 1;
-1 and 2 between 2 and 10 2 between 2 and 10 and 1
-1 1
-select 1 and 0 or 2, 2 or 1 and 0;
-1 and 0 or 2 2 or 1 and 0
-1 1