diff options
| author | unknown <holyfoot/hf@mysql.com/hfmain.(none)> | 2006-12-31 12:39:20 +0400 |
|---|---|---|
| committer | unknown <holyfoot/hf@mysql.com/hfmain.(none)> | 2006-12-31 12:39:20 +0400 |
| commit | 84d0cda44c8fd13b3b88f7b90ec8fb755caef361 (patch) | |
| tree | bd5218816ba9b52d92e7f30d5d6e4c12b6153b87 /sql/item_strfunc.cc | |
| parent | 27ecbeecdc0a064d0ff5ea88abe01e786fcc5b99 (diff) | |
| parent | 44e0239396a0337fcdb455589f591dd42f2acd43 (diff) | |
| download | mariadb-git-84d0cda44c8fd13b3b88f7b90ec8fb755caef361.tar.gz | |
Merge mysql.com:/d2/hf/clean/my50-clean
into mysql.com:/d2/hf/common/my50-common
mysql-test/mysql-test-run.pl:
Auto merged
sql/item_func.cc:
Auto merged
sql/item_strfunc.cc:
Auto merged
Diffstat (limited to 'sql/item_strfunc.cc')
| -rw-r--r-- | sql/item_strfunc.cc | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/sql/item_strfunc.cc b/sql/item_strfunc.cc index c5ada846190..f98a14d2cc6 100644 --- a/sql/item_strfunc.cc +++ b/sql/item_strfunc.cc @@ -1787,8 +1787,13 @@ bool Item_func_current_user::fix_fields(THD *thd, Item **ref) if (Item_func_sysconst::fix_fields(thd, ref)) return TRUE; - Security_context *ctx= (context->security_ctx + Security_context *ctx= +#ifndef NO_EMBEDDED_ACCESS_CHECKS + (context->security_ctx ? context->security_ctx : thd->security_ctx); +#else + thd->security_ctx; +#endif /*NO_EMBEDDED_ACCESS_CHECKS*/ return init(ctx->priv_user, ctx->priv_host); } |