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 | 2e3d8fd6d539420ec20651c14e272062357b6e33 (patch) | |
| tree | dbd5eed33a764e82c97cd90f56cdda2eb22fef63 /sql/slave.h | |
| parent | 2cc4d329818e3179629a7192a8abe99f65ce6df8 (diff) | |
| parent | 99ef45cbeb224da15366f7b4f40a3cf3b14f6107 (diff) | |
| download | mariadb-git-2e3d8fd6d539420ec20651c14e272062357b6e33.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); |