summaryrefslogtreecommitdiff
path: root/sql/sql_cache.cc
diff options
context:
space:
mode:
authorunknown <bell@51.0.168.192.in-addr.arpa>2005-02-21 17:07:40 +0200
committerunknown <bell@51.0.168.192.in-addr.arpa>2005-02-21 17:07:40 +0200
commit4ef3e54b94de272f26e672c991a86794407899ee (patch)
treea7d51887d8bfe5267752c34d56737dc11ba4f36e /sql/sql_cache.cc
parentb6a28b3c78bc1c9cea5c966cf8ec2c904280c7b0 (diff)
downloadmariadb-git-4ef3e54b94de272f26e672c991a86794407899ee.tar.gz
postreview changes
sql/sql_cache.cc: typo fixed comment added small optimisation
Diffstat (limited to 'sql/sql_cache.cc')
-rw-r--r--sql/sql_cache.cc21
1 files changed, 17 insertions, 4 deletions
diff --git a/sql/sql_cache.cc b/sql/sql_cache.cc
index f05a12b0ceb..5fa161257c7 100644
--- a/sql/sql_cache.cc
+++ b/sql/sql_cache.cc
@@ -311,7 +311,7 @@ TODO list:
#include "emb_qcache.h"
#endif
-#if !defined(DBUG_OFF) && !defined(DBUG_OFF)
+#if !defined(EXTRA_DBUG) && !defined(DBUG_OFF)
#define MUTEX_LOCK(M) { DBUG_PRINT("lock", ("mutex lock 0x%lx", (ulong)(M))); \
pthread_mutex_lock(M);}
#define MUTEX_UNLOCK(M) {DBUG_PRINT("lock", ("mutex unlock 0x%lx",\
@@ -2104,6 +2104,21 @@ void Query_cache::invalidate_table(Query_cache_block *table_block)
}
+/*
+ Register given table list begining with given position in tables table of
+ block
+
+ SYNOPSIS
+ Query_cache::register_tables_from_list
+ tables_used given table list
+ counter number current position in table of tables of block
+ block_table pointer to current position in tables table of block
+
+ RETURN
+ 0 error
+ number of next position of table entry in table of tables of block
+*/
+
TABLE_COUNTER_TYPE
Query_cache::register_tables_from_list(TABLE_LIST *tables_used,
TABLE_COUNTER_TYPE counter,
@@ -2738,13 +2753,12 @@ static TABLE_COUNTER_TYPE process_and_count_tables(TABLE_LIST *tables_used,
TABLE_COUNTER_TYPE table_count = 0;
for (; tables_used; tables_used= tables_used->next_global)
{
-
+ table_count++;
if (tables_used->view)
{
DBUG_PRINT("qcache", ("view %s, db %s",
tables_used->view_name.str,
tables_used->view_db.str));
- table_count++;
*tables_type|= HA_CACHE_TBL_NONTRANSACT;
{
TABLE_COUNTER_TYPE subcount;
@@ -2756,7 +2770,6 @@ static TABLE_COUNTER_TYPE process_and_count_tables(TABLE_LIST *tables_used,
}
else
{
- table_count++;
DBUG_PRINT("qcache", ("table %s, db %s, type %u",
tables_used->table->s->table_name,
tables_used->table->s->table_cache_key,