From 831a6124833e4c2e5f52f166ce82ab43bd56624d Mon Sep 17 00:00:00 2001
From: "dlenev@brandersnatch.localdomain" <>
Date: Mon, 11 Apr 2005 10:44:48 +0400
Subject: [PATCH] Merging fix for bug #9796 "Query Cache caches queries with
 CURRENT_USER() function" into 4.1 tree.

---
 sql/item_create.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sql/item_create.cc b/sql/item_create.cc
index 4b313d49466..2b12a1310b9 100644
--- a/sql/item_create.cc
+++ b/sql/item_create.cc
@@ -306,7 +306,7 @@ Item *create_func_current_user()
   char buff[HOSTNAME_LENGTH+USERNAME_LENGTH+2];
   uint length;
 
-  thd->safe_to_cache_query= 0;
+  thd->lex->safe_to_cache_query= 0;
   length= (uint) (strxmov(buff, thd->priv_user, "@", thd->priv_host, NullS) -
 		  buff);
   return new Item_string(NullS, thd->memdup(buff, length), length,