diff options
| author | Konstantin Osipov <kostja@sun.com> | 2009-12-01 16:51:50 +0300 |
|---|---|---|
| committer | Konstantin Osipov <kostja@sun.com> | 2009-12-01 16:51:50 +0300 |
| commit | 1480dafe2f018ad794f52ed7257aba53d6050afa (patch) | |
| tree | 638c795bd178a4fb46d2eecae55390c861d0a266 /sql/sql_trigger.cc | |
| parent | 6d5dd31584d984686fefa1ae3271deeedcc34cc6 (diff) | |
| download | mariadb-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_trigger.cc')
| -rw-r--r-- | sql/sql_trigger.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sql/sql_trigger.cc b/sql/sql_trigger.cc index caf5c84e1f9..61cd9bffa57 100644 --- a/sql/sql_trigger.cc +++ b/sql/sql_trigger.cc @@ -525,7 +525,7 @@ end: /* If we are under LOCK TABLES we should restore original state of meta-data locks. Otherwise call to close_thread_tables() will take care about both - TABLE instance created by reopen_name_locked_table() and meta-data lock. + TABLE instance created by reopen_name_locked_table() and metadata lock. */ if (thd->locked_tables && tables && tables->table) mdl_downgrade_exclusive_lock(&thd->mdl_context, @@ -1872,7 +1872,7 @@ Table_triggers_list::change_table_name_in_trignames(const char *old_db_name, i.e. it either will complete successfully, or will fail leaving files in their initial state. Also this method assumes that subject table is not renamed to itself. - This method needs to be called under an exclusive table name lock. + This method needs to be called under an exclusive table metadata lock. @retval FALSE Success @retval TRUE Error @@ -1894,8 +1894,8 @@ bool Table_triggers_list::change_table_name(THD *thd, const char *db, /* This method interfaces the mysql server code protected by - either LOCK_open mutex or with an exclusive table name lock. - In the future, only an exclusive table name lock will be enough. + either LOCK_open mutex or with an exclusive metadata lock. + In the future, only an exclusive metadata lock will be enough. */ #ifndef DBUG_OFF if (mdl_is_exclusive_lock_owner(&thd->mdl_context, 0, db, old_table)) |