diff options
| author | unknown <dlenev@mysql.com> | 2005-04-11 09:53:54 +0400 |
|---|---|---|
| committer | unknown <dlenev@mysql.com> | 2005-04-11 09:53:54 +0400 |
| commit | d79e696952ca56f4a31a63648bfe182a5de76b8e (patch) | |
| tree | 35c7316b09fe88b5f04e5135e82b15ca5a79ecc7 /sql/item_create.cc | |
| parent | ebdf2c0153c23b41442cacf4cdf78d499305a748 (diff) | |
| parent | 3e0a62636725b4bfa958d1416d80a12d269b1b94 (diff) | |
| download | mariadb-git-d79e696952ca56f4a31a63648bfe182a5de76b8e.tar.gz | |
Merge mysql.com:/home/dlenev/src/mysql-4.0-bg9796
into mysql.com:/home/dlenev/src/mysql-4.1-merges
sql/item_create.cc:
Auto merged
mysql-test/r/query_cache.result:
Auto merged
mysql-test/t/query_cache.test:
Auto merged
Diffstat (limited to 'sql/item_create.cc')
| -rw-r--r-- | sql/item_create.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/item_create.cc b/sql/item_create.cc index c0361c928be..4b313d49466 100644 --- a/sql/item_create.cc +++ b/sql/item_create.cc @@ -306,6 +306,7 @@ Item *create_func_current_user() char buff[HOSTNAME_LENGTH+USERNAME_LENGTH+2]; uint length; + thd->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, |