diff options
| author | unknown <holyfoot/hf@mysql.com/deer.(none)> | 2006-12-08 15:22:46 +0400 |
|---|---|---|
| committer | unknown <holyfoot/hf@mysql.com/deer.(none)> | 2006-12-08 15:22:46 +0400 |
| commit | 5e3f06db4285a8cdffff3f764eb9ab937b0bd5a7 (patch) | |
| tree | 43128114a85f5d57da70cd789bda9061ff995896 /sql/item_strfunc.cc | |
| parent | e8be5f6d50cf87ca36f77c08a6ab76688aca411d (diff) | |
| parent | ea1f7e4b5697c3275c301011beaa394548f273ae (diff) | |
| download | mariadb-git-5e3f06db4285a8cdffff3f764eb9ab937b0bd5a7.tar.gz | |
Merge bk@192.168.21.1:mysql-5.0-opt
into mysql.com:/home/hf/work/embt/my50-embt
libmysqld/lib_sql.cc:
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
mysql-test/mysql-test-run.pl:
merging
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 0b48a00012a..63700e9b53d 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); } |