diff options
| author | Konstantin Osipov <kostja@sun.com> | 2009-11-30 22:03:37 +0300 |
|---|---|---|
| committer | Konstantin Osipov <kostja@sun.com> | 2009-11-30 22:03:37 +0300 |
| commit | 3226c107fbf0a5533411b834daec4b06048b36ad (patch) | |
| tree | 9ae4570228ac52e0055a55b7ebb3e020f24d0497 /sql/sql_handler.cc | |
| parent | 6fd51b850268d333d2cdad3a574e6a601d5a091d (diff) | |
| download | mariadb-git-3226c107fbf0a5533411b834daec4b06048b36ad.tar.gz | |
Backport of:
------------------------------------------------------------
revno: 2630.4.11
committer: Dmitry Lenev <dlenev@mysql.com>
branch nick: mysql-6.0-3726-w
timestamp: Tue 2008-05-27 21:31:53 +0400
message:
WL#3726 "DDL locking for all metadata objects".
After review fixes in progress.
Changed mysql_lock_tables() to be no longer responsible for
reopening table if waiting for the lock on it was aborted.
This allows to get rid of several annoying functions.
Diffstat (limited to 'sql/sql_handler.cc')
| -rw-r--r-- | sql/sql_handler.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sql/sql_handler.cc b/sql/sql_handler.cc index c8a66073a67..5c034a0452a 100644 --- a/sql/sql_handler.cc +++ b/sql/sql_handler.cc @@ -519,8 +519,7 @@ retry: */ thd->open_tables= thd->handler_tables; - lock= mysql_lock_tables(thd, &tables->table, 1, - MYSQL_LOCK_NOTIFY_IF_NEED_REOPEN, &need_reopen); + lock= mysql_lock_tables(thd, &tables->table, 1, 0, &need_reopen); /* restore previous context */ thd->open_tables= backup_open_tables; |