database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-12-24 11:21:21 +03:00
Code Activity

branches/zip: Merge 1792:1809 from trunk.

Browse Source
This commit is contained in:
marko
2007-09-06 07:12:12 +00:00
parent ffe9a4c52e
commit 462c911fe8
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
handler/ha_innodb.cc
View File

@@ -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);
}