diff options
| author | unknown <holyfoot/hf@deer.(none)> | 2006-12-08 15:49:43 +0400 |
|---|---|---|
| committer | unknown <holyfoot/hf@deer.(none)> | 2006-12-08 15:49:43 +0400 |
| commit | ab4c37dcce7f82493552d839920bf979f9af3ecb (patch) | |
| tree | 3f5808c4f1df2167e359f23ff9b392810d3875f8 /sql/item_strfunc.cc | |
| parent | 893055bed6828ef4330b06b36ca6397cfa73fc3c (diff) | |
| parent | 298aff126768cc6fe81714b5bf8b3ae23f153444 (diff) | |
| download | mariadb-git-ab4c37dcce7f82493552d839920bf979f9af3ecb.tar.gz | |
Merge bk@192.168.21.1:mysql-5.1-opt
into mysql.com:/home/hf/work/embt/my51-embt
libmysqld/lib_sql.cc:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/include/federated.inc:
Auto merged
mysql-test/t/flush_block_commit.test:
Auto merged
mysql-test/t/innodb.test:
Auto merged
mysql-test/t/join.test:
Auto merged
mysql-test/t/status.test:
Auto merged
mysql-test/t/trigger.test:
Auto merged
sql/item_func.cc:
Auto merged
sql/item_strfunc.cc:
Auto merged
sql/share/errmsg.txt:
Auto merged
mysql-test/r/flush_block_commit.result:
SCCS 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 e8c87893471..a057594706e 100644 --- a/sql/item_strfunc.cc +++ b/sql/item_strfunc.cc @@ -1811,8 +1811,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); } |