summaryrefslogtreecommitdiff
path: root/sql/sql_cache.h
diff options
context:
space:
mode:
authorunknown <monty@hundin.mysql.fi>2001-12-22 15:13:31 +0200
committerunknown <monty@hundin.mysql.fi>2001-12-22 15:13:31 +0200
commit9625a39ddd2d2e0eb6def99ca1ae34a48c300040 (patch)
treef8ed70ccb23812937954a6f217c183b3677d978a /sql/sql_cache.h
parent5478a2adb7949716a04461875dc7bd4005705ee8 (diff)
downloadmariadb-git-9625a39ddd2d2e0eb6def99ca1ae34a48c300040.tar.gz
Fixed access privilege bug in query cache.
Change tests to use database 'mysqltest' instead of 'foo' Add option to not print access denied messages to check_table_access() Docs/manual.texi: Updated query cache information. client/mysqltest.c: When connection to the database '*NO-ONE*, connect without specify a database. include/raid.h: Portability fix mysql-test/r/drop.result: Change test to use database 'mysqltest' instead of 'foo' mysql-test/r/flush.result: Change test to use database 'mysqltest' instead of 'foo' mysql-test/r/innodb.result: Change test to use database 'mysqltest' instead of 'foo' mysql-test/r/query_cache.result: Change test to use database 'mysqltest' instead of 'foo' mysql-test/t/drop.test: Change test to use database 'mysqltest' instead of 'foo' mysql-test/t/flush.test: Change test to use database 'mysqltest' instead of 'foo' mysql-test/t/innodb.test: Change test to use database 'mysqltest' instead of 'foo' mysql-test/t/query_cache.test: Change test to use database 'mysqltest' instead of 'foo' sql/mysql_priv.h: Add option to not print access denied messages sql/net_pkg.cc: Fix for query cache sql/net_serv.cc: Speed improvment sql/sql_cache.cc: Fixed access privilege bug in query cache sql/sql_cache.h: Always compiled with integrity check function prototypes. sql/sql_do.cc: Removed warning sql/sql_parse.cc: Add option to not print access denied messages
Diffstat (limited to 'sql/sql_cache.h')
-rw-r--r--sql/sql_cache.h16
1 files changed, 10 insertions, 6 deletions
diff --git a/sql/sql_cache.h b/sql/sql_cache.h
index 6f8d9bb6dbf..50ae765e446 100644
--- a/sql/sql_cache.h
+++ b/sql/sql_cache.h
@@ -354,7 +354,7 @@ protected:
Check if the query is in the cache and if this is true send the
data to client.
*/
- my_bool send_result_to_client(THD *thd, char *query, uint query_length);
+ int send_result_to_client(THD *thd, char *query, uint query_length);
/* Remove all queries that uses any of the listed following tables */
void invalidate(TABLE_LIST *tables_used);
@@ -375,7 +375,15 @@ protected:
void destroy();
-#ifndef DBUG_OFF
+ friend void query_cache_insert(NET *net, const char *packet, ulong length);
+ friend void query_cache_end_of_result(NET *net);
+ friend void query_cache_abort(NET *net);
+
+ /*
+ The following functions are only used when debugging
+ We don't protect these with ifndef DEBUG_OFF to not have to recompile
+ everything if we want to add checks of the cache at some places.
+ */
void wreck(uint line, const char *message);
void bins_dump();
void cache_dump();
@@ -385,10 +393,6 @@ protected:
my_bool in_list(Query_cache_block * root, Query_cache_block * point,
const char *name);
my_bool in_blocks(Query_cache_block * point);
-#endif
- friend void query_cache_insert(NET *net, const char *packet, ulong length);
- friend void query_cache_end_of_result(NET *net);
- friend void query_cache_abort(NET *net);
};
extern Query_cache query_cache;