branches/zip: Merge 1792:1809 from trunk.

462c911f · marko · ffe9a4c5 · 462c911f
Commit 462c911f authored Sep 06, 2007 by marko
Show whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

handler/ha_innodb.cc handler/ha_innodb.cc +3 -3

No files found.
--- 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);
 	}