mirror of
https://github.com/MariaDB/server.git
synced 2026-05-09 08:34:28 +02:00
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
This commit is contained in:
parent
c0364263d9
commit
0d76cb7ea4
7 changed files with 115 additions and 157 deletions
|
|
@ -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
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue