summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorunknown <kent@mysql.com>2006-03-01 14:20:35 +0100
committerunknown <kent@mysql.com>2006-03-01 14:20:35 +0100
commitf2d934d96b2295813c7d3adbf36e6446f7073304 (patch)
tree528761c22ce757f7e5c6d783087682e4484371e2
parentfb936d2a86416127c031f3972f669e1c2b4291b3 (diff)
parent483aa9a1789158a3f333cd203c2fcdb5a82e891d (diff)
downloadmariadb-git-f2d934d96b2295813c7d3adbf36e6446f7073304.tar.gz
Merge mysqldev@production.mysql.com:my/mysql-5.1-release
into mysql.com:/Users/kent/mysql/bk/mysql-5.1-release
-rw-r--r--sql/sql_base.cc2
1 files changed, 0 insertions, 2 deletions
diff --git a/sql/sql_base.cc b/sql/sql_base.cc
index f48df61e9a1..074747cab18 100644
--- a/sql/sql_base.cc
+++ b/sql/sql_base.cc
@@ -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 */
/*