diff options
| author | Sinisa@sinisa.nasamreza.org <> | 2002-06-29 16:32:45 +0300 |
|---|---|---|
| committer | Sinisa@sinisa.nasamreza.org <> | 2002-06-29 16:32:45 +0300 |
| commit | 5a65b8b20a989f6d53ad75f6f684eac2deafa4fd (patch) | |
| tree | 151c617f5ebb82d7bcee4f2fcc47d94f260f85e8 /mysql-test | |
| parent | 66f86faafd7be135ed36ef1fb9382481f5b9f6f2 (diff) | |
| parent | 816dc4eb28d16dfbba72b4db01bdce214d6211ed (diff) | |
| download | mariadb-git-5a65b8b20a989f6d53ad75f6f684eac2deafa4fd.tar.gz | |
Merge sinisa@work.mysql.com:/home/bk/mysql-4.0
into sinisa.nasamreza.org:/mnt/work/mysql-4.0
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/r/func_test.result | 6 | ||||
| -rw-r--r-- | mysql-test/r/rpl_get_lock.result | 3 | ||||
| -rw-r--r-- | mysql-test/t/func_test.test | 3 | ||||
| -rw-r--r-- | mysql-test/t/rpl_get_lock.test | 1 |
4 files changed, 12 insertions, 1 deletions
diff --git a/mysql-test/r/func_test.result b/mysql-test/r/func_test.result index deea5b8bb8b..7d0ef3cff89 100644 --- a/mysql-test/r/func_test.result +++ b/mysql-test/r/func_test.result @@ -40,6 +40,12 @@ select 2 in (3,2,5,9,5,1),"monty" in ("david","monty","allan"), 1.2 in (1.4,1.2, select -1.49 or -1.49,0.6 or 0.6; -1.49 or -1.49 0.6 or 0.6 1 1 +select 3 ^ 11; +3 ^ 11 +8 +select 1 XOR 0; +1 XOR 0 +1 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 diff --git a/mysql-test/r/rpl_get_lock.result b/mysql-test/r/rpl_get_lock.result index c86b8f830a5..6201a751961 100644 --- a/mysql-test/r/rpl_get_lock.result +++ b/mysql-test/r/rpl_get_lock.result @@ -17,4 +17,7 @@ get_lock("lock",3) select * from t1; n 1 +select check_lock("lock"); +check_lock("lock") +1 drop table t1; diff --git a/mysql-test/t/func_test.test b/mysql-test/t/func_test.test index ec44009b1a6..844db1a0214 100644 --- a/mysql-test/t/func_test.test +++ b/mysql-test/t/func_test.test @@ -15,7 +15,8 @@ select 2 between 1 and 3, "monty" between "max" and "my",2=2 and "monty" between select 'b' between 'a' and 'c', 'B' between 'a' and 'c'; select 2 in (3,2,5,9,5,1),"monty" in ("david","monty","allan"), 1.2 in (1.4,1.2,1.0); select -1.49 or -1.49,0.6 or 0.6; - +select 3 ^ 11; +select 1 XOR 0; # # Wrong usage of functions # diff --git a/mysql-test/t/rpl_get_lock.test b/mysql-test/t/rpl_get_lock.test index 3fe45eecf46..e197b9911bb 100644 --- a/mysql-test/t/rpl_get_lock.test +++ b/mysql-test/t/rpl_get_lock.test @@ -22,6 +22,7 @@ sync_with_master; select get_lock("lock",3); select * from t1; connection master1; +select check_lock("lock"); drop table t1; save_master_pos; connection slave; |