From 94e707cf3c0df3cbcc6e8e8f63f8f2dabf5c855c Mon Sep 17 00:00:00 2001
From: marko <>
Date: Thu, 6 Sep 2007 07:12:12 +0000
Subject: [PATCH] branches/zip: Merge 1792:1809 from trunk.

---
 handler/ha_innodb.cc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/handler/ha_innodb.cc b/handler/ha_innodb.cc
index 0ceb3ad4ae4..be5ce3efca8 100644
--- a/handler/ha_innodb.cc
+++ b/handler/ha_innodb.cc
@@ -6535,9 +6535,6 @@ ha_innobase::external_lock(
 			innobase_register_stmt(ht, thd);
 		}
 
-		trx->n_mysql_tables_in_use++;
-		prebuilt->mysql_has_locked = TRUE;
-
 		if (trx->isolation_level == TRX_ISO_SERIALIZABLE
 			&& prebuilt->select_lock_type == LOCK_NONE
 			&& thd_test_options(thd,
@@ -6586,6 +6583,9 @@ ha_innobase::external_lock(
 			trx->mysql_n_tables_locked++;
 		}
 
+		trx->n_mysql_tables_in_use++;
+		prebuilt->mysql_has_locked = TRUE;
+
 		DBUG_RETURN(0);
 	}