database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-01-06 05:22:24 +03:00
Code Activity

Post-merge fixes.

Browse Source 
sql/ha_ndbcluster_binlog.cc:
  Correcting use of bad variable in merge.
sql/sql_base.cc:
  Removing assertion check for mutex in table share.
This commit is contained in:
unknown
2006-02-27 17:23:20 +01:00
parent 9a26412c5f
commit 594ba86bc5
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
sql/sql_base.cc
View File

@@ -2414,11 +2414,17 @@ void abort_locked_tables(THD *thd,const char *db, const char *table_name)
share - Pointer to table share structure
DESCRIPTION
We are intentionally not checking that share->mutex is locked
since this function should only be called when opening a table
share and before it is entered into the table_def_cache (meaning
that it cannot be fetched by another thread, even accidentally).
PRE-CONDITION(S)
share is non-NULL
The LOCK_open mutex is locked
The share->mutex is locked
POST-CONDITION(S)
@@ -2438,7 +2444,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 */
/*