diff options
| author | unknown <holyfoot/hf@hfmain.(none)> | 2006-12-31 12:41:42 +0400 |
|---|---|---|
| committer | unknown <holyfoot/hf@hfmain.(none)> | 2006-12-31 12:41:42 +0400 |
| commit | cbff25d04ae0d72c2a42d78aea33764d0818808e (patch) | |
| tree | 141237cc110455e8b067a8fc14d520bdf40aa4bf /sql/item_strfunc.cc | |
| parent | d73b5b8e83c1ae52e35e73d0338c296b9383e2b4 (diff) | |
| parent | a2fc58745115a17a8e12a9c46c9631e6d9576551 (diff) | |
| download | mariadb-git-cbff25d04ae0d72c2a42d78aea33764d0818808e.tar.gz | |
Merge mysql.com:/d2/hf/clean/my51-clean
into mysql.com:/d2/hf/common/my51-common
libmysqld/Makefile.am:
Auto merged
libmysqld/lib_sql.cc:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/t/ps.test:
Auto merged
sql/item_func.cc:
Auto merged
sql/item_strfunc.cc:
Auto merged
sql/share/errmsg.txt:
Auto merged
sql/sql_insert.cc:
Auto merged
BitKeeper/deleted/.del-ps_not_windows.test:
Auto merged
storage/myisam/ha_myisam.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 3faee2ec9a1..89a85a19f56 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); } |