From d90d3bcafc220ca9d2cb2c80ff2db62247bf3e69 Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 15 Apr 2002 17:09:30 -0600 Subject: reckless slave option bison 1.34 yacc rule compliance more robust handling of relay log corruption mysql-test/r/rpl000014.result: updated result mysql-test/r/rpl_log.result: updated result sql/mysqld.cc: reckless slave option sql/slave.cc: reckless slave + more robust handling of relay log corruption sql/slave.h: reckless slave sql/sql_yacc.yy: brought the rules into compliance with bison 1.34 by adding ';' at the end of each rule --- sql/slave.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'sql/slave.h') diff --git a/sql/slave.h b/sql/slave.h index 354fc46e99d..b70ca6f6d00 100644 --- a/sql/slave.h +++ b/sql/slave.h @@ -30,7 +30,7 @@ extern bool use_slave_mask; extern char* slave_load_tmpdir; extern my_string master_info_file,relay_log_info_file; extern my_string opt_relay_logname, opt_relaylog_index_name; -extern bool opt_skip_slave_start; +extern bool opt_skip_slave_start, opt_reckless_slave; extern ulong relay_log_space_limit; struct st_master_info; -- cgit v1.2.1 From f96c4216601ed7b8a48ab48b4435d3b6fe134dea Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 25 Apr 2002 07:33:02 -0600 Subject: replication bugfixes sql/slave.cc: removed buggy loop sql/slave.h: fixed uninited variable use --- sql/slave.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'sql/slave.h') diff --git a/sql/slave.h b/sql/slave.h index b70ca6f6d00..75e3e81e57f 100644 --- a/sql/slave.h +++ b/sql/slave.h @@ -160,6 +160,7 @@ typedef struct st_relay_log_info st_relay_log_info():info_fd(-1),cur_log_fd(-1),inited(0), cur_log_init_count(0), + abort_slave(0),slave_running(0), log_pos_current(0),abort_pos_wait(0), skip_log_purge(0) { @@ -280,7 +281,8 @@ typedef struct st_master_info bool ignore_stop_event; - st_master_info():fd(-1), io_thd(0), inited(0), old_format(0) + st_master_info():fd(-1), io_thd(0), inited(0), old_format(0),abort_slave(0), + slave_running(0) { host[0] = 0; user[0] = 0; password[0] = 0; bzero(&file,sizeof(file)); -- cgit v1.2.1 From 4acaf126ac4b2489626577c92ab8cabd52f35986 Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 30 Apr 2002 16:40:46 +0300 Subject: Portability fix --- sql/slave.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'sql/slave.h') diff --git a/sql/slave.h b/sql/slave.h index 75e3e81e57f..34df17f2851 100644 --- a/sql/slave.h +++ b/sql/slave.h @@ -333,7 +333,7 @@ typedef struct st_table_rule_ent #define SLAVE_FORCE_ALL 4 int init_slave(); -void init_slave_skip_errors(char* arg); +void init_slave_skip_errors(const char* arg); int flush_master_info(MASTER_INFO* mi); int flush_relay_log_info(RELAY_LOG_INFO* rli); int register_slave_on_master(MYSQL* mysql); -- cgit v1.2.1 From d9d8b4642d185d317309d8371aa92fc3c4355d50 Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 29 May 2002 15:29:42 +0300 Subject: Fixed a bug. sql/slave.h: Fixed a bug in option handling. sql/sql_repl.h: Fixed a bug in option handling. --- sql/slave.h | 2 -- 1 file changed, 2 deletions(-) (limited to 'sql/slave.h') diff --git a/sql/slave.h b/sql/slave.h index 34df17f2851..16735891815 100644 --- a/sql/slave.h +++ b/sql/slave.h @@ -415,9 +415,7 @@ extern bool do_table_inited, ignore_table_inited, wild_do_table_inited, wild_ignore_table_inited; extern bool table_rules_on; -#ifndef DBUG_OFF extern int disconnect_slave_event_count, abort_slave_event_count ; -#endif // the master variables are defaults read from my.cnf or command line extern uint master_port, master_connect_retry, report_port; -- cgit v1.2.1