database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-11-03 14:33:32 +03:00
Code Activity

post-merge fixes

Browse Source
This commit is contained in:
bell@sanja.is.com.ua
2005-07-05 12:23:13 +03:00
parent 15d02e60e1
commit 2e96c47a82
2 changed files with 91 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

179
mysql-test/r/query_cache.result
View File

File diff suppressed because one or more lines are too long

5
sql/sql_cache.cc
View File

@@ -278,7 +278,6 @@ TODO list:
- Move MRG_MYISAM table type processing to handlers, something like:
tables_used->table->file->register_used_filenames(callback,
first_argument);
- Make derived tables cachable.
- QC improvement suggested by Monty:
- Add a counter in open_table() for how many MERGE (ISAM or MyISAM)
tables are cached in the table cache.
@@ -2137,7 +2136,7 @@ Query_cache::register_tables_from_list(TABLE_LIST *tables_used,
{
if (tables_used->derived)
{
DBUG_PRINT("qcache", ("derived table skipped");
DBUG_PRINT("qcache", ("derived table skipped"));
n--;
block_table--;
continue;
@@ -2785,7 +2784,7 @@ static TABLE_COUNTER_TYPE process_and_count_tables(TABLE_LIST *tables_used,
tables_used->table->s->table_name,
tables_used->table->s->table_cache_key,
tables_used->table->s->db_type));
if (table_used->derived)
if (tables_used->derived)
{
table_count--;
DBUG_PRINT("qcache", ("derived table skipped"));