From bf9ccde948d07aaaec0e78f67ed981071056e550 Mon Sep 17 00:00:00 2001
From: "kroki@mysql.com" <>
Date: Sat, 6 May 2006 18:24:41 +0400
Subject: [PATCH] Fix race condition in the test for bug#16501.

---
 mysql-test/r/func_misc.result | 4 ++--
 mysql-test/t/func_misc.test   | 4 +++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/mysql-test/r/func_misc.result b/mysql-test/r/func_misc.result
index a5beef859f0..8bcdd8b7cbc 100644
--- a/mysql-test/r/func_misc.result
+++ b/mysql-test/r/func_misc.result
@@ -76,13 +76,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 9c706161ba9..e2641f8d6cd 100644
--- a/mysql-test/t/func_misc.test
+++ b/mysql-test/t/func_misc.test
@@ -66,12 +66,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');