diff options
| author | Jon Olav Hauglid <jon.hauglid@oracle.com> | 2010-08-18 13:55:37 +0200 |
|---|---|---|
| committer | Jon Olav Hauglid <jon.hauglid@oracle.com> | 2010-08-18 13:55:37 +0200 |
| commit | f2123f34e3c0b9315626406786293a5fafa2fc13 (patch) | |
| tree | 34705bdb0e8d518cdc7400d5d2afb11ae8cf2bab /sql/sql_base.cc | |
| parent | eb498cce4dafc2eda285c71ed96d64e451f02ec2 (diff) | |
| parent | d0d8bbed5e901e59044be6bcaa6d4020238a1eb4 (diff) | |
| download | mariadb-git-f2123f34e3c0b9315626406786293a5fafa2fc13.tar.gz | |
Merge from mysql-5.5-bugfixing to mysql-5.5-runtime
Diffstat (limited to 'sql/sql_base.cc')
| -rw-r--r-- | sql/sql_base.cc | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/sql/sql_base.cc b/sql/sql_base.cc index 849bc9662a0..6ca7a0a771a 100644 --- a/sql/sql_base.cc +++ b/sql/sql_base.cc @@ -2594,10 +2594,6 @@ tdc_wait_for_old_version(THD *thd, const char *db, const char *table_name, is never opened. In both cases, metadata locks are always taken according to the lock strategy. - If the lock strategy is OTLS_DOWNGRADE_IF_EXISTS and opening the table - is successful, the exclusive metadata lock acquired by the caller - is downgraded to a shared lock. - RETURN TRUE Open failed. "action" parameter may contain type of action needed to remedy problem before retrying again. @@ -3041,15 +3037,6 @@ retry_share: mysql_mutex_unlock(&LOCK_open); - /* - In CREATE TABLE .. If NOT EXISTS .. SELECT we have found that - table exists now we should downgrade our exclusive metadata - lock on this table to SW metadata lock. - */ - if (table_list->lock_strategy == TABLE_LIST::OTLS_DOWNGRADE_IF_EXISTS && - !(flags & MYSQL_OPEN_HAS_MDL_LOCK)) - mdl_ticket->downgrade_exclusive_lock(MDL_SHARED_WRITE); - table->mdl_ticket= mdl_ticket; table->next= thd->open_tables; /* Link into simple list */ |