summaryrefslogtreecommitdiff
path: root/sql/slave.h
diff options
context:
space:
mode:
authorunknown <sasha@mysql.sashanet.com>2001-12-12 18:55:33 -0700
committerunknown <sasha@mysql.sashanet.com>2001-12-12 18:55:33 -0700
commit623eedda2601f083c45a6f4af794e5b4b2703901 (patch)
tree7eaf5681e41349d3135b099f195338bc5e4b85c9 /sql/slave.h
parentb9562004e9d8e062790f6346bd8a0439fd5e8822 (diff)
downloadmariadb-git-623eedda2601f083c45a6f4af794e5b4b2703901.tar.gz
slave-skip-errors
added extra/mysql_install.c - will work on it in 4.0, but it does not hurt to have it sit in 3.23 tree for now since it will eventually be backported to 3.23 anyway Docs/manual.texi: documented slave-skip-errors updated change history extra/resolve_stack_dump.c: fixed wrong help message include/my_bitmap.h: bitmap code updates mysql-test/r/rpl_get_lock.result: test for a possible bug in release_lock() replication mysql-test/t/rpl_get_lock.test: test for possible bug in release_lock replication mysys/my_bitmap.c: bitmap code updates/clean-up sql/mysqld.cc: slave-skip-errors sql/slave.cc: slave-skip-errors sql/slave.h: slave skip errors
Diffstat (limited to 'sql/slave.h')
-rw-r--r--sql/slave.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/sql/slave.h b/sql/slave.h
index 09887ecd82c..2934e675d56 100644
--- a/sql/slave.h
+++ b/sql/slave.h
@@ -2,8 +2,11 @@
#define SLAVE_H
#define SLAVE_NET_TIMEOUT 3600
+#define MAX_SLAVE_ERROR 2000
extern ulong slave_net_timeout, master_retry_count;
+extern MY_BITMAP slave_error_mask;
+extern bool use_slave_mask;
typedef struct st_master_info
{
@@ -89,6 +92,7 @@ int add_table_rule(HASH* h, const char* table_spec);
int add_wild_table_rule(DYNAMIC_ARRAY* a, const char* table_spec);
void init_table_rule_hash(HASH* h, bool* h_inited);
void init_table_rule_array(DYNAMIC_ARRAY* a, bool* a_inited);
+void init_slave_skip_errors(char* arg);
void end_slave(); // clean up
int init_master_info(MASTER_INFO* mi);