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()

1 files changed, 4 insertions, 3 deletions

diff --git a/sql/net_pkg.cc b/sql/net_pkg.cc
index 9fb478ca664..2f26ad81bd5 100644
--- a/sql/net_pkg.cc
+++ b/sql/net_pkg.cc
@@ -30,6 +30,7 @@ void send_error(NET *net, uint sql_errno, const char *err)
 		      err ? err : net->last_error[0] ?
 		      net->last_error : "NULL")); 
 
+  query_cache_abort(net);
   if (thd)
     thd->query_error = 1; // needed to catch query errors during replication
   if (!err)
@@ -102,9 +103,9 @@ net_printf(NET *net, uint errcode, ...)
   DBUG_ENTER("net_printf");
   DBUG_PRINT("enter",("message: %u",errcode));
 
-  if(thd) thd->query_error = 1;
-  // if we are here, something is wrong :-)
-
+  if (thd)
+    thd->query_error = 1;	// if we are here, something is wrong :-)
+  query_cache_abort(net);	// Safety
   va_start(args,errcode);
   format=ER(errcode);
   offset= net->return_errno ? 2 : 0;