diff options
| author | unknown <tulin@dl145c.mysql.com> | 2005-09-14 17:58:20 +0200 |
|---|---|---|
| committer | unknown <tulin@dl145c.mysql.com> | 2005-09-14 17:58:20 +0200 |
| commit | ee2125c919b73b44c028716af14d2c6d311605df (patch) | |
| tree | d46146fa982f3c243e7cf4778b516f9c21cce3d6 /sql/sql_acl.h | |
| parent | 24f047831f9bdcbef5762a3be1f6d506422e0642 (diff) | |
| parent | 528c3a71f847afe6be5bdf460be57512eada71cb (diff) | |
| download | mariadb-git-ee2125c919b73b44c028716af14d2c6d311605df.tar.gz | |
merge
sql/mysql_priv.h:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_acl.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/table.h:
Auto merged
storage/ndb/src/common/portlib/NdbTCP.cpp:
Auto merged
storage/ndb/src/common/portlib/win32/NdbTCP.c:
Auto merged
Diffstat (limited to 'sql/sql_acl.h')
| -rw-r--r-- | sql/sql_acl.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_acl.h b/sql/sql_acl.h index 50aa35e8cc7..0d739e860e9 100644 --- a/sql/sql_acl.h +++ b/sql/sql_acl.h @@ -230,7 +230,7 @@ bool sp_grant_privileges(THD *thd, const char *sp_db, const char *sp_name, bool is_proc); bool check_routine_level_acl(THD *thd, const char *db, const char *name, bool is_proc); - +bool is_acl_user(const char *host, const char *user); #ifdef NO_EMBEDDED_ACCESS_CHECKS #define check_grant(A,B,C,D,E,F) 0 #define check_grant_db(A,B) 0 |