diff options
| author | unknown <mats@mysql.com> | 2004-11-25 12:23:41 +0100 |
|---|---|---|
| committer | unknown <mats@mysql.com> | 2004-11-25 12:23:41 +0100 |
| commit | c4dbf1e969253f3b65106036af0f47a600a77ad5 (patch) | |
| tree | dbd5eed33a764e82c97cd90f56cdda2eb22fef63 /sql/slave.h | |
| parent | 32c3009d3a8bd1a0ea591977cf878795625e592c (diff) | |
| parent | 467c481479ac511cc445b9703260e9b3bb8b2e96 (diff) | |
| download | mariadb-git-c4dbf1e969253f3b65106036af0f47a600a77ad5.tar.gz | |
Merge
BitKeeper/etc/logging_ok:
auto-union
sql/slave.cc:
Auto merged
sql/slave.h:
Auto merged
sql/sql_repl.cc:
Auto merged
sql/repl_failsafe.cc:
Merging 4.0 and 4.1 changes.
Diffstat (limited to 'sql/slave.h')
| -rw-r--r-- | sql/slave.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/slave.h b/sql/slave.h index c6cb81699a2..a4d123329c6 100644 --- a/sql/slave.h +++ b/sql/slave.h @@ -522,7 +522,8 @@ void clear_until_condition(RELAY_LOG_INFO* rli); void clear_slave_error_timestamp(RELAY_LOG_INFO* rli); int init_master_info(MASTER_INFO* mi, const char* master_info_fname, const char* slave_info_fname, - bool abort_if_no_master_info_file); + bool abort_if_no_master_info_file, + int thread_mask); void end_master_info(MASTER_INFO* mi); int init_relay_log_info(RELAY_LOG_INFO* rli, const char* info_fname); void end_relay_log_info(RELAY_LOG_INFO* rli); |