Commit 93b4fbea authored by unknown's avatar unknown
Browse files

Merging fix for bug #9796 "Query Cache caches queries with CURRENT_USER()

function" into 4.1 tree.

parent d79e6969
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -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,