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

into mysql.com:/Users/kent/mysql/bk/mysql-5.1-release
This commit is contained in:
unknown 2006-03-01 14:20:35 +01:00
commit f2d934d96b

View File

@ -2409,7 +2409,6 @@ void abort_locked_tables(THD *thd,const char *db, const char *table_name)
share is non-NULL
The LOCK_open mutex is locked
The share->mutex is locked
POST-CONDITION(S)
@ -2429,7 +2428,6 @@ void assign_new_table_id(TABLE_SHARE *share)
/* Preconditions */
DBUG_ASSERT(share != NULL);
safe_mutex_assert_owner(&LOCK_open);
safe_mutex_assert_owner(&share->mutex);
ulong tid= ++last_table_id; /* get next id */
/*