diff options
author | monty@mysql.com <> | 2004-03-18 00:09:13 +0200 |
---|---|---|
committer | monty@mysql.com <> | 2004-03-18 00:09:13 +0200 |
commit | f34a642d6e492fa527e09593aa695e67d3867263 (patch) | |
tree | 93869dd2e083920baaab586bbd65e0b77b42fcfa /sql/sql_parse.cc | |
parent | f9ad65049088dc58591c954903a22e527e96ea5a (diff) | |
download | mariadb-git-f34a642d6e492fa527e09593aa695e67d3867263.tar.gz |
after merge fixes
Diffstat (limited to 'sql/sql_parse.cc')
-rw-r--r-- | sql/sql_parse.cc | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc index 690b4133f61..51600f712e9 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -117,6 +117,7 @@ static bool end_active_trans(THD *thd) } +#ifdef HAVE_REPLICATION inline bool all_tables_not_ok(THD *thd, TABLE_LIST *tables) { return (table_rules_on && tables && !tables_ok(thd,tables) && @@ -124,6 +125,7 @@ inline bool all_tables_not_ok(THD *thd, TABLE_LIST *tables) !tables_ok(thd, (TABLE_LIST *)thd->lex->auxilliary_table_list.first))); } +#endif static HASH hash_user_connections; @@ -3961,6 +3963,8 @@ void mysql_parse(THD *thd, char *inBuf, uint length) DBUG_VOID_RETURN; } + +#ifdef HAVE_REPLICATION /* Usable by the replication SQL thread only: just parse a query to know if it can be ignored because of replicate-*-table rules. @@ -3985,7 +3989,7 @@ bool mysql_test_parse_for_slave(THD *thd, char *inBuf, uint length) return error; } - +#endif /***************************************************************************** ** Store field definition for create |