Added functions :

* binary XOR
* logical XOR
* CHECK_LOCK("lock_name")

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;