diff options
author | unknown <bell@sanja.is.com.ua> | 2002-06-09 00:58:05 +0300 |
---|---|---|
committer | unknown <bell@sanja.is.com.ua> | 2002-06-09 00:58:05 +0300 |
commit | 6a2eec80b0a47c67a8621d68fc447b170d2c0bce (patch) | |
tree | cb84872ae3c34ad83ac3336e53b65d86952ca6ca /sql/sql_cache.cc | |
parent | fb104d76b5a95cb7056288f4840776cfd5ee7899 (diff) | |
download | mariadb-git-6a2eec80b0a47c67a8621d68fc447b170d2c0bce.tar.gz |
removed unneeded table name pointer
transaction-live memory cleanup moved to ha_commit/ha_rollback
fixed query cache validator to work correctly on systems that allocate unaligned dat
sql/handler.cc:
transaction-live memory cleanup moved to ha_commit/ha_rollback
sql/sql_cache.cc:
removed unneeded table name pointer
fixed debug enter message
fixed query cache validator to work correctly on systems that allocate unaligned data
sql/sql_class.cc:
removed unneeded table name pointer
sql/sql_parse.cc:
transaction-live memory cleanup moved to ha_commit/ha_rollback
sql/table.h:
removed unneeded table name pointer
Diffstat (limited to 'sql/sql_cache.cc')
-rw-r--r-- | sql/sql_cache.cc | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/sql/sql_cache.cc b/sql/sql_cache.cc index b8dfda076c5..ec6f4cf2736 100644 --- a/sql/sql_cache.cc +++ b/sql/sql_cache.cc @@ -1073,7 +1073,8 @@ void Query_cache::invalidate(CHANGED_TABLE_LIST *tables_used) { invalidate_table((byte*) tables_used->key, tables_used->key_length); DBUG_PRINT("qcache", (" db %s, table %s", tables_used->key, - tables_used->table_name)); + tables_used->key+ + strlen(tables_used->key)+1)); } } STRUCT_UNLOCK(&structure_guard_mutex); @@ -1994,7 +1995,7 @@ Query_cache_block * Query_cache::allocate_block(ulong len, my_bool not_less, ulong min, my_bool under_guard) { - DBUG_ENTER("Query_cache::allocate_n_lock_block"); + DBUG_ENTER("Query_cache::allocate_block"); DBUG_PRINT("qcache", ("len %lu, not less %d, min %lu, uder_guard %d", len, not_less,min,under_guard)); @@ -3060,7 +3061,8 @@ my_bool Query_cache::check_integrity(bool not_locked) DBUG_PRINT("qcache", ("block 0x%lx, type %u...", (ulong) block, (uint) block->type)); // Check allignment - if ((ulonglong)block % ALIGN_SIZE(1)) + if ((((ulonglong)block) % (ulonglong)ALIGN_SIZE(1)) != + (((ulonglong)first_block) % (ulonglong)ALIGN_SIZE(1))) { DBUG_PRINT("error", ("block 0x%lx do not aligned by %d", (ulong) block, |