diff options
| author | unknown <marko@hundin.mysql.fi> | 2004-07-12 16:47:22 +0300 |
|---|---|---|
| committer | unknown <marko@hundin.mysql.fi> | 2004-07-12 16:47:22 +0300 |
| commit | fbc420ba0ee7bcd951a44aefff4c771578bc9ac2 (patch) | |
| tree | 52a0ac716061edce542e60cd3d8171e9d7589c25 /sql/ha_innodb.cc | |
| parent | 7b6fc58ffff432df623d78511eab7e19ddb32f50 (diff) | |
| download | mariadb-git-fbc420ba0ee7bcd951a44aefff4c771578bc9ac2.tar.gz | |
InnoDB: LOCK TABLE clean-up
innobase/include/lock0lock.h:
Improve comments regarding LOCK_TABLE_EXP
innobase/include/row0mysql.h:
Rename row_unlock_table_for_mysql() to row_unlock_tables_for_mysql()
and improve its comment
innobase/include/trx0trx.h:
Rename n_tables_locked to n_lock_table_exp
innobase/lock/lock0lock.c:
Rename n_tables_locked to n_lock_table_exp
Increment n_lock_table_exp already in lock_table_create()
Replace some ut_ad() assertions with ut_a()
innobase/row/row0mysql.c:
Rename n_tables_locked to n_lock_table_exp
Rename row_unlock_table_for_mysql() to row_unlock_tables_for_mysql()
and improve its comment
innobase/trx/trx0trx.c:
Rename n_tables_locked to n_lock_table_exp
sql/ha_innodb.cc:
Rename n_tables_locked to n_lock_table_exp
Rename row_unlock_table_for_mysql() to row_unlock_tables_for_mysql()
Diffstat (limited to 'sql/ha_innodb.cc')
| -rw-r--r-- | sql/ha_innodb.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/ha_innodb.cc b/sql/ha_innodb.cc index df193bde947..21dd7f748c2 100644 --- a/sql/ha_innodb.cc +++ b/sql/ha_innodb.cc @@ -4656,8 +4656,8 @@ ha_innobase::external_lock( trx->n_mysql_tables_in_use--; prebuilt->mysql_has_locked = FALSE; auto_inc_counter_for_this_stat = 0; - if (trx->n_tables_locked) { - row_unlock_table_for_mysql(trx); + if (trx->n_lock_table_exp) { + row_unlock_tables_for_mysql(trx); } /* If the MySQL lock count drops to zero we know that the current SQL |