summaryrefslogtreecommitdiff
path: root/sql
diff options
context:
space:
mode:
authorunknown <bell@sanja.is.com.ua>2005-10-18 21:42:26 +0300
committerunknown <bell@sanja.is.com.ua>2005-10-18 21:42:26 +0300
commit89a5b23dc4589a1268e9d651b1b8651d83e60667 (patch)
tree3ad6f48c1f1fc9e6154a4680d67a70181cbf0f85 /sql
parent9e3df6cc173bac95a5cbed45963bf3a577c7a9ab (diff)
downloadmariadb-git-89a5b23dc4589a1268e9d651b1b8651d83e60667.tar.gz
check of ACL initialization in is_acl_user() (BUG#13504)
mysql-test/r/skip_grants.result: creation view with DEFINER clause if --skip-grant-tables mysql-test/t/skip_grants.test: creation view with DEFINER clause if --skip-grant-tables sql/sql_acl.cc: check of ACL initialization in is_acl_user()
Diffstat (limited to 'sql')
-rw-r--r--sql/sql_acl.cc5
1 files changed, 5 insertions, 0 deletions
diff --git a/sql/sql_acl.cc b/sql/sql_acl.cc
index 771cb93ed9c..b28c3be0167 100644
--- a/sql/sql_acl.cc
+++ b/sql/sql_acl.cc
@@ -1487,6 +1487,11 @@ end:
bool is_acl_user(const char *host, const char *user)
{
bool res;
+
+ /* --skip-grants */
+ if (!initialized)
+ return TRUE;
+
VOID(pthread_mutex_lock(&acl_cache->lock));
res= find_acl_user(host, user, TRUE) != NULL;
VOID(pthread_mutex_unlock(&acl_cache->lock));