summaryrefslogtreecommitdiff
path: root/sql/sql_acl.cc
diff options
context:
space:
mode:
authorunknown <knielsen@knielsen-hq.org>2010-04-28 21:29:45 +0200
committerunknown <knielsen@knielsen-hq.org>2010-04-28 21:29:45 +0200
commit1a13a2df47e3aaa1044e6c9282b506e672802230 (patch)
tree2bba04b2716a9d868bb812dc0a1ec94c6fa993c4 /sql/sql_acl.cc
parent9f9629ca820d77fa7ea77afaa316b127f22ee007 (diff)
downloadmariadb-git-1a13a2df47e3aaa1044e6c9282b506e672802230.tar.gz
After-merge fixes for MySQL 5.1.46 merge into MariaDB: result file update and compiler warning removals.
Diffstat (limited to 'sql/sql_acl.cc')
-rw-r--r--sql/sql_acl.cc2
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/sql_acl.cc b/sql/sql_acl.cc
index ce91f83ce85..e285ff55556 100644
--- a/sql/sql_acl.cc
+++ b/sql/sql_acl.cc
@@ -4442,8 +4442,10 @@ bool check_routine_level_acl(THD *thd, const char *db, const char *name,
ulong get_table_grant(THD *thd, TABLE_LIST *table)
{
ulong privilege;
+#ifndef EMBEDDED_LIBRARY
Security_context *sctx= thd->security_ctx;
const char *db = table->db ? table->db : thd->db;
+#endif
GRANT_TABLE *grant_table;
rw_rdlock(&LOCK_grant);