diff options
| author | unknown <lars@mysql.com> | 2005-03-21 23:05:55 +0100 |
|---|---|---|
| committer | unknown <lars@mysql.com> | 2005-03-21 23:05:55 +0100 |
| commit | 69ca9a9416df9084c2a75aeb62a6979cecf4e5c6 (patch) | |
| tree | 8b6efeea8d68c7888aaf78f4150376d941b923e5 /sql/sql_acl.h | |
| parent | 796b352862a5c94ea2de1c5910ab45d2ca5eb8ae (diff) | |
| parent | 03c42246a5a50ce62b49e8fce4b263b0468d5f46 (diff) | |
| download | mariadb-git-69ca9a9416df9084c2a75aeb62a6979cecf4e5c6.tar.gz | |
Merge
sql/log_event.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/slave.cc:
Auto merged
sql/slave.h:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_acl.h:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_repl.cc:
Auto merged
sql/sql_repl.h:
Auto merged
sql/Makefile.am:
Manual merge
sql/log.cc:
Manual merge
Diffstat (limited to 'sql/sql_acl.h')
| -rw-r--r-- | sql/sql_acl.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sql/sql_acl.h b/sql/sql_acl.h index fd22da2a9fc..21f14fc3045 100644 --- a/sql/sql_acl.h +++ b/sql/sql_acl.h @@ -14,6 +14,9 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +#include "slave.h" // for tables_ok(), rpl_filter +extern Rpl_filter *rpl_filter; + #define SELECT_ACL (1L << 0) #define INSERT_ACL (1L << 1) #define UPDATE_ACL (1L << 2) |