diff options
| author | unknown <serg@sergbook.mysql.com> | 2002-06-30 23:32:36 +0200 |
|---|---|---|
| committer | unknown <serg@sergbook.mysql.com> | 2002-06-30 23:32:36 +0200 |
| commit | 1334d3bb107a34c726500566635270ed18492f73 (patch) | |
| tree | e63e504fcaa328d5b0db772394b1fc85f692c43e /mysql-test | |
| parent | ea091c0babfb8f8b1ea411c2115bb6cfa9e044c3 (diff) | |
| parent | d90caf3d53a87fd1b52fde8e6a60314867c58513 (diff) | |
| download | mariadb-git-1334d3bb107a34c726500566635270ed18492f73.tar.gz | |
Merge work:/home/bk/mysql-4.0
into sergbook.mysql.com:/usr/home/serg/Abk/mysql-4.0
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/r/func_test.result | 12 | ||||
| -rw-r--r-- | mysql-test/r/rpl_get_lock.result | 10 | ||||
| -rw-r--r-- | mysql-test/t/func_test.test | 5 | ||||
| -rw-r--r-- | mysql-test/t/rpl_get_lock.test | 5 |
4 files changed, 21 insertions, 11 deletions
diff --git a/mysql-test/r/func_test.result b/mysql-test/r/func_test.result index 7d0ef3cff89..8cfae44b9dd 100644 --- a/mysql-test/r/func_test.result +++ b/mysql-test/r/func_test.result @@ -40,12 +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 3 ^ 11, 1 ^ 1, 1 ^ 0, 1 ^ NULL, NULL ^ 1; +3 ^ 11 1 ^ 1 1 ^ 0 1 ^ NULL NULL ^ 1 +8 0 1 NULL NULL +select 1 XOR 1, 1 XOR 0, 0 XOR 1, 0 XOR 0, NULL XOR 1, 1 XOR NULL, 0 XOR NULL; +1 XOR 1 1 XOR 0 0 XOR 1 0 XOR 0 NULL XOR 1 1 XOR NULL 0 XOR NULL +0 1 1 0 NULL NULL NULL 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 6201a751961..cfbf4351f32 100644 --- a/mysql-test/r/rpl_get_lock.result +++ b/mysql-test/r/rpl_get_lock.result @@ -17,7 +17,13 @@ get_lock("lock",3) select * from t1; n 1 -select check_lock("lock"); -check_lock("lock") +select is_free_lock("lock"); +is_free_lock("lock") +0 +select is_free_lock("lock2"); +is_free_lock("lock2") 1 +select is_free_lock(NULL); +is_free_lock(NULL) +NULL drop table t1; diff --git a/mysql-test/t/func_test.test b/mysql-test/t/func_test.test index 844db1a0214..f5ad2e21c73 100644 --- a/mysql-test/t/func_test.test +++ b/mysql-test/t/func_test.test @@ -15,8 +15,9 @@ 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; +select 3 ^ 11, 1 ^ 1, 1 ^ 0, 1 ^ NULL, NULL ^ 1; +select 1 XOR 1, 1 XOR 0, 0 XOR 1, 0 XOR 0, NULL XOR 1, 1 XOR NULL, 0 XOR NULL; + # # Wrong usage of functions # diff --git a/mysql-test/t/rpl_get_lock.test b/mysql-test/t/rpl_get_lock.test index e197b9911bb..1d98eb16bb0 100644 --- a/mysql-test/t/rpl_get_lock.test +++ b/mysql-test/t/rpl_get_lock.test @@ -21,8 +21,11 @@ connection slave; sync_with_master; select get_lock("lock",3); select * from t1; +select is_free_lock("lock"); +# Check lock functions +select is_free_lock("lock2"); +select is_free_lock(NULL); connection master1; -select check_lock("lock"); drop table t1; save_master_pos; connection slave; |