summaryrefslogtreecommitdiff
path: root/mysql-test
diff options
context:
space:
mode:
Diffstat (limited to 'mysql-test')
-rw-r--r--mysql-test/r/func_misc.result4
-rw-r--r--mysql-test/t/func_misc.test4
2 files changed, 5 insertions, 3 deletions
diff --git a/mysql-test/r/func_misc.result b/mysql-test/r/func_misc.result
index 67f2f2de3d1..33e642c74c4 100644
--- a/mysql-test/r/func_misc.result
+++ b/mysql-test/r/func_misc.result
@@ -70,13 +70,13 @@ IS_USED_LOCK('bug16501') = CONNECTION_ID()
SELECT RELEASE_LOCK('bug16501');
RELEASE_LOCK('bug16501')
1
+GET_LOCK('bug16501',600)
+1
SELECT IS_USED_LOCK('bug16501') = connection_id
FROM t1
WHERE conn = 'con1';
IS_USED_LOCK('bug16501') = connection_id
1
-GET_LOCK('bug16501',600)
-1
SELECT IS_USED_LOCK('bug16501') = CONNECTION_ID();
IS_USED_LOCK('bug16501') = CONNECTION_ID()
1
diff --git a/mysql-test/t/func_misc.test b/mysql-test/t/func_misc.test
index 59cce884766..0475dd4bdb6 100644
--- a/mysql-test/t/func_misc.test
+++ b/mysql-test/t/func_misc.test
@@ -61,12 +61,14 @@ send SELECT GET_LOCK('bug16501',600);
connection default;
SELECT IS_USED_LOCK('bug16501') = CONNECTION_ID();
SELECT RELEASE_LOCK('bug16501');
+connection con1;
+reap;
+connection default;
SELECT IS_USED_LOCK('bug16501') = connection_id
FROM t1
WHERE conn = 'con1';
connection con1;
-reap;
SELECT IS_USED_LOCK('bug16501') = CONNECTION_ID();
SELECT RELEASE_LOCK('bug16501');
SELECT IS_USED_LOCK('bug16501');