diff options
| author | unknown <monty@mysql.com> | 2004-10-06 01:24:21 +0300 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2004-10-06 01:24:21 +0300 |
| commit | 0d76cb7ea4a20570342d51136a6da598fb553800 (patch) | |
| tree | 0acac4cf9ee4cc804d6d4376b33bfb1b7f99efce /sql/handler.cc | |
| parent | c0364263d9dcc9f122529804576f65640587acd4 (diff) | |
| download | mariadb-git-0d76cb7ea4a20570342d51136a6da598fb553800.tar.gz | |
Reverted patch for new usage of open_count as it caused more problems than it solved
Cleaned up patch for checking locks for multi-table updates
myisam/mi_close.c:
Reverted patch for new usage of open_counts
myisam/mi_locking.c:
Reverted patch for new usage of open_counts
sql/ha_myisam.cc:
Reverted patch for new usage of open_counts
sql/handler.cc:
Removed compiler warning
sql/sql_acl.cc:
Removed compiler warning
sql/sql_table.cc:
No need to unlock after failed call to external_lock()
sql/sql_update.cc:
Cleaned up (and made it more secure) patch for checking locks for multi-table updates
Diffstat (limited to 'sql/handler.cc')
| -rw-r--r-- | sql/handler.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/handler.cc b/sql/handler.cc index 9eb129fab45..65078a485c5 100644 --- a/sql/handler.cc +++ b/sql/handler.cc @@ -348,7 +348,7 @@ int ha_commit_trans(THD *thd, THD_TRANS* trans) if (trans == &thd->transaction.all && my_b_tell(&thd->transaction.trans_log)) { - if (error= wait_if_global_read_lock(thd, 0, 0)) + if ((error= wait_if_global_read_lock(thd, 0, 0))) { /* Note that ROLLBACK [TO SAVEPOINT] does not have this test; it's |