From a3593930eefc17ac417bc31fa0d95d35137a1cab Mon Sep 17 00:00:00 2001
From: Satya B <satya.bn@sun.com>
Date: Mon, 4 May 2009 14:35:16 +0530
Subject: [PATCH 1/2] Additional Fix for BUG#40827 - Killing insert-select to
 MyISAM can cause                                table corruption

Disabling the mysiam_debug.test in embedded mode because of BUG#43733

mysql-test/t/myisam_debug.test:
  Disable the test in embedded mode
---
 mysql-test/t/myisam_debug.test | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/mysql-test/t/myisam_debug.test b/mysql-test/t/myisam_debug.test
index a73187cd2ca..913668c5f22 100644
--- a/mysql-test/t/myisam_debug.test
+++ b/mysql-test/t/myisam_debug.test
@@ -1,5 +1,8 @@
 --source include/have_debug.inc
 
+# We disable this test in embedded mode because of BUG#43733
+--source include/not_embedded.inc
+
 --echo #
 --echo # BUG#40827 - Killing insert-select to MyISAM can cause table corruption
 --echo #

From 29de48d836c2dbff201a217db7d35c5f8c9e486f Mon Sep 17 00:00:00 2001
From: Davi Arnaut <Davi.Arnaut@Sun.COM>
Date: Tue, 5 May 2009 20:47:43 +0200
Subject: [PATCH 2/2] Remove unused variable.

---
 sql/slave.cc | 2 --
 1 file changed, 2 deletions(-)

diff --git a/sql/slave.cc b/sql/slave.cc
index 9ba0788a5e4..a6264dfb0ac 100644
--- a/sql/slave.cc
+++ b/sql/slave.cc
@@ -465,8 +465,6 @@ terminate_slave_thread(THD *thd,
                        volatile uint *slave_running,
                        bool skip_lock)
 {
-  int error;
-
   DBUG_ENTER("terminate_slave_thread");
   if (!skip_lock)
   {