summaryrefslogtreecommitdiff
path: root/sql/sql_handler.cc
diff options
context:
space:
mode:
authorKonstantin Osipov <kostja@sun.com>2009-12-01 16:51:50 +0300
committerKonstantin Osipov <kostja@sun.com>2009-12-01 16:51:50 +0300
commit1480dafe2f018ad794f52ed7257aba53d6050afa (patch)
tree638c795bd178a4fb46d2eecae55390c861d0a266 /sql/sql_handler.cc
parent6d5dd31584d984686fefa1ae3271deeedcc34cc6 (diff)
downloadmariadb-git-1480dafe2f018ad794f52ed7257aba53d6050afa.tar.gz
Backport of:
------------------------------------------------------------ revno: 2630.8.3 committer: Dmitry Lenev <dlenev@mysql.com> branch nick: mysql-6.0-3726-w4 timestamp: Thu 2008-06-05 10:48:36 +0400 message: WL#3726 "DDL locking for all metadata objects". After-review fixes in progress. Adjust some comments that were using old terminology (name locks instead of exclusive metadata locks), brought some of them up-to-date with current situation in code. sql/sql_base.cc: Adjusted comments to use proper terminology. sql/sql_delete.cc: Adjusted comments to use proper terminology. sql/sql_handler.cc: Adjusted comments to use proper terminology. sql/sql_partition.cc: Adjusted comments to use proper terminology also fixed one comment to correspond to what really happens in code. sql/sql_show.cc: Adjusted comments to use proper terminology. sql/sql_table.cc: Adjusted comments to use proper terminology, brought one of them up-to-date with current situation. sql/sql_trigger.cc: Adjusted comments to use proper terminology. sql/table.h: Removed two unused members of TABLE_SHARE struct.
Diffstat (limited to 'sql/sql_handler.cc')
-rw-r--r--sql/sql_handler.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/sql_handler.cc b/sql/sql_handler.cc
index 15c73fcadfe..a2c1f0e3782 100644
--- a/sql/sql_handler.cc
+++ b/sql/sql_handler.cc
@@ -282,7 +282,8 @@ bool mysql_ha_open(THD *thd, TABLE_LIST *tables, bool reopen)
The thd->handler_tables list is kept as-is to avoid deadlocks if
open_table(), called by open_tables(), needs to back-off because
- of a pending name-lock on the table being opened.
+ of a pending exclusive metadata lock or flush for the table being
+ opened.
See open_table() back-off comments for more details.
*/