Skip to content

M
MariaDB
Commit 476a03ac authored by kent@mysql.com's avatar kent@mysql.com
Browse files
Options

Merge mysqldev@production.mysql.com:my/mysql-5.1-release 

into mysql.com:/Users/kent/mysql/bk/mysql-5.1-release
parents 0196184b db8344aa
Show whitespace changes
Inline Side-by-side
Showing with 0 additions and 2 deletions
sql/sql_base.cc
View file @ 476a03ac
...@@ -2409,7 +2409,6 @@ void abort_locked_tables(THD *thd,const char *db, const char *table_name) ...@@ -2409,7 +2409,6 @@ void abort_locked_tables(THD *thd,const char *db, const char *table_name)
share is non-NULL share is non-NULL
The LOCK_open mutex is locked The LOCK_open mutex is locked
The share->mutex is locked
POST-CONDITION(S) POST-CONDITION(S)
...@@ -2429,7 +2428,6 @@ void assign_new_table_id(TABLE_SHARE *share) ...@@ -2429,7 +2428,6 @@ void assign_new_table_id(TABLE_SHARE *share)
/* Preconditions */ /* Preconditions */
DBUG_ASSERT(share != NULL); DBUG_ASSERT(share != NULL);
safe_mutex_assert_owner(&LOCK_open); safe_mutex_assert_owner(&LOCK_open);
safe_mutex_assert_owner(&share->mutex);
ulong tid= ++last_table_id; /* get next id */ ulong tid= ++last_table_id; /* get next id */
/* /*
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7