diff options
| author | unknown <serg@serg.mylan> | 2005-01-24 15:50:13 +0100 |
|---|---|---|
| committer | unknown <serg@serg.mylan> | 2005-01-24 15:50:13 +0100 |
| commit | ba3b78d968c56806d8606e47bc4555a8436004c6 (patch) | |
| tree | 8f16454d52b7844621e51a609323f1638a14e22e /sql/sql_cache.cc | |
| parent | 343e9bbd34ecd89deb7d28214e23171894b8b2a0 (diff) | |
| parent | 8bdb500105f97e3007e652f73d99c373d38f2aad (diff) | |
| download | mariadb-git-ba3b78d968c56806d8606e47bc4555a8436004c6.tar.gz | |
Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
mysys/mf_keycache.c:
Auto merged
sql/item.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/slave.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/table.cc:
Auto merged
Diffstat (limited to 'sql/sql_cache.cc')
| -rw-r--r-- | sql/sql_cache.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sql/sql_cache.cc b/sql/sql_cache.cc index bd42a2c1720..55e96ec0c6d 100644 --- a/sql/sql_cache.cc +++ b/sql/sql_cache.cc @@ -1157,12 +1157,12 @@ void Query_cache::invalidate(THD *thd, TABLE_LIST *tables_used, DBUG_ASSERT(!using_transactions || tables_used->table!=0); if (tables_used->derived) continue; - if (using_transactions && - (tables_used->table->file->table_cache_type() == + if (using_transactions && + (tables_used->table->file->table_cache_type() == HA_CACHE_TBL_TRANSACT)) - /* + /* Tables_used->table can't be 0 in transaction. - Only 'drop' invalidate not opened table, but 'drop' + Only 'drop' invalidate not opened table, but 'drop' force transaction finish. */ thd->add_changed_table(tables_used->table); @@ -1210,7 +1210,7 @@ void Query_cache::invalidate(CHANGED_TABLE_LIST *tables_used) */ void Query_cache::invalidate_locked_for_write(TABLE_LIST *tables_used) { - DBUG_ENTER("Query_cache::invalidate (changed table list)"); + DBUG_ENTER("Query_cache::invalidate_locked_for_write"); if (query_cache_size > 0 && tables_used) { STRUCT_LOCK(&structure_guard_mutex); |