diff options
| author | unknown <bell@sanja.is.com.ua> | 2005-07-05 12:23:13 +0300 |
|---|---|---|
| committer | unknown <bell@sanja.is.com.ua> | 2005-07-05 12:23:13 +0300 |
| commit | dd72175d0b3b23f1b8873e21e9348e807990e7ce (patch) | |
| tree | b400a2b64f5c021741e4894d96b540aa97929cee /sql/sql_cache.cc | |
| parent | b5fd8cae27ae710ae5ab3681534c315c6049b6f7 (diff) | |
| download | mariadb-git-dd72175d0b3b23f1b8873e21e9348e807990e7ce.tar.gz | |
post-merge fixes
mysql-test/r/query_cache.result:
results moved
sql/sql_cache.cc:
postmerge fixes
Diffstat (limited to 'sql/sql_cache.cc')
| -rw-r--r-- | sql/sql_cache.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sql/sql_cache.cc b/sql/sql_cache.cc index 279a1ccb443..e0a15b7d449 100644 --- a/sql/sql_cache.cc +++ b/sql/sql_cache.cc @@ -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")); |