diff options
| author | sasha@mysql.sashanet.com <> | 2000-11-13 23:43:02 -0700 |
|---|---|---|
| committer | sasha@mysql.sashanet.com <> | 2000-11-13 23:43:02 -0700 |
| commit | f2b9a60ec44261352423c6c38bc0092524c7e772 (patch) | |
| tree | 401cbc03a4aff0a1d3a85fa57dc15bdb822d0e8e /sql/slave.h | |
| parent | d23407701480884f4932d435863bf8ec94fff209 (diff) | |
| download | mariadb-git-f2b9a60ec44261352423c6c38bc0092524c7e772.tar.gz | |
repl-tests/test-repl-ts/repl-timestamp.master.reject
this file needs to be deleted
sql/log_event.cc
fixed warnings
sql/log_event.h
fixed () #define bug
sql/mysqlbinlog.cc
fixed length argument - was supposed to be one less
sql/mysqld.cc
replicate-do/ignore-table now works, wild does not yet
sql/mysql_priv.h
updating argument to add_table_to_list() -- needed for replicate-do/ignore table
sql/slave.cc
changes fore replicate-do/ignore-table
close the socket before going to sleep sleeping after error
bad event was being freed too early
sql/slave.h
changes for replicate-do/ignore-table
sql/sql_class.cc
slave_thread variable to THD
sql/sql_class.h
added slave_thread to THD, fixed bug in end_time()
sql/sql_parse.cc
updating argument to add_tables_to_list()
sql/sql_table.cc
fixed bug in mysql_rm_table()
sql/sql_yacc.yy
fixed up add_table_to_list() calls to accept updating argument
sql/table.h
added updating to TABLE_LIST
Diffstat (limited to 'sql/slave.h')
| -rw-r--r-- | sql/slave.h | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/sql/slave.h b/sql/slave.h index 67036b4120c..5df90cbf55b 100644 --- a/sql/slave.h +++ b/sql/slave.h @@ -67,11 +67,16 @@ int fetch_nx_table(THD* thd, MASTER_INFO* mi); int show_master_info(THD* thd); int show_binlog_info(THD* thd); +int tables_ok(THD* thd, TABLE_LIST* tables); +// see if the query uses any tables that should not be replicated + int db_ok(const char* db, I_List<i_string> &do_list, I_List<i_string> &ignore_list ); // check to see if the database is ok to operate on with respect to the // do and ignore lists - used in replication +int add_table_rule(HASH* h, const char* table_spec); +void init_table_rule_hash(HASH* h, bool* h_inited); int init_master_info(MASTER_INFO* mi); extern bool opt_log_slave_updates ; @@ -81,7 +86,10 @@ extern bool slave_running; extern pthread_t slave_real_id; extern MASTER_INFO glob_mi; extern HASH replicate_do_table, replicate_ignore_table; -extern bool do_table_inited, ignore_table_inited; +extern DYNAMIC_ARRAY replicate_wild_do_table, replicate_wild_ignore_table; +extern bool do_table_inited, ignore_table_inited, + wild_do_table_inited, wild_ignore_table_inited; +extern bool table_rules_on; // the master variables are defaults read from my.cnf or command line extern uint master_port, master_connect_retry; @@ -93,3 +101,5 @@ extern I_List<i_string_pair> replicate_rewrite_db; extern I_List<THD> threads; #endif + + |