From 9e1ed2e4dcaed23b6acf5944c1cfa0cba66fe29d Mon Sep 17 00:00:00 2001
From: "monty@hundin.mysql.fi" <>
Date: Sat, 22 Dec 2001 15:13:31 +0200
Subject: 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()

---
 sql/net_pkg.cc | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'sql/net_pkg.cc')

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;
-- 
cgit v1.2.1