Merging fix for bug #9796 "Query Cache caches queries with CURRENT_USER()
function" into 4.1 tree.
This commit is contained in:
parent
b0dd388190
commit
831a612483
@ -306,7 +306,7 @@ Item *create_func_current_user()
|
|||||||
char buff[HOSTNAME_LENGTH+USERNAME_LENGTH+2];
|
char buff[HOSTNAME_LENGTH+USERNAME_LENGTH+2];
|
||||||
uint length;
|
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) -
|
length= (uint) (strxmov(buff, thd->priv_user, "@", thd->priv_host, NullS) -
|
||||||
buff);
|
buff);
|
||||||
return new Item_string(NullS, thd->memdup(buff, length), length,
|
return new Item_string(NullS, thd->memdup(buff, length), length,
|
||||||
|
Loading…
x
Reference in New Issue
Block a user