From 8e154c93ab1df7a488fea44dee67bab66c107599 Mon Sep 17 00:00:00 2001
From: Jon Olav Hauglid <jon.hauglid@sun.com>
Date: Fri, 2 Jul 2010 11:54:14 +0200
Subject: [PATCH] Followup for Bug #54360 Deadlock DROP/ALTER/CREATE DATABASE  
                       with open HANDLER

Fixes a problem with schema.test visible using embedded server.
The HANDLER was not closed which caused the test to hang.

The problem was not visible if the test was run on a normal server
as the the handler there was implicitly closed by DATABASE DDL
statements doing Events::drop_schema_events().
---
 mysql-test/r/schema.result | 1 +
 mysql-test/t/schema.test   | 1 +
 2 files changed, 2 insertions(+)

diff --git a/mysql-test/r/schema.result b/mysql-test/r/schema.result
index 890f53669b5..853c3bcf575 100644
--- a/mysql-test/r/schema.result
+++ b/mysql-test/r/schema.result
@@ -66,6 +66,7 @@ DROP DATABASE db1;
 CREATE DATABASE db2;
 ALTER DATABASE db2 DEFAULT CHARACTER SET utf8;
 DROP DATABASE db2;
+HANDLER t1 CLOSE;
 # Connection default
 # Reaping: DROP DATABASE db1
 #
diff --git a/mysql-test/t/schema.test b/mysql-test/t/schema.test
index e3592f39780..ed3b98ec2f7 100644
--- a/mysql-test/t/schema.test
+++ b/mysql-test/t/schema.test
@@ -133,6 +133,7 @@ connection con1;
 CREATE DATABASE db2;
 ALTER DATABASE db2 DEFAULT CHARACTER SET utf8;
 DROP DATABASE db2;
+HANDLER t1 CLOSE;
 
 --echo # Connection default
 connection default;