diff options
| author | unknown <tsmith@sita.local> | 2007-08-29 15:28:38 -0600 |
|---|---|---|
| committer | unknown <tsmith@sita.local> | 2007-08-29 15:28:38 -0600 |
| commit | 48193af48948acb84ddd3b488b6f8faa4a6d126b (patch) | |
| tree | 81c00dc60322deeb0c094deef5d141509c980a60 /sql/slave.h | |
| parent | 024bd2f612825cd36c93775728f56856e5f28267 (diff) | |
| parent | 053c9d1c473df4e1457992ee6a39da3e0cb39bdd (diff) | |
| download | mariadb-git-48193af48948acb84ddd3b488b6f8faa4a6d126b.tar.gz | |
Merge sita.local:/Users/tsmith/m/bk/maint/51-target22
into sita.local:/Users/tsmith/m/bk/maint/51
sql/field.cc:
Auto merged
sql/log_event_old.cc:
Auto merged
sql/rpl_record.h:
Auto merged
sql/rpl_utility.cc:
Auto merged
sql/rpl_utility.h:
Auto merged
sql/slave.h:
Auto merged
storage/innobase/handler/ha_innodb.cc:
Auto merged
sql/log_event.cc:
Manual merge
sql/log_event.h:
Manual merge
sql/log_event_old.h:
Manual merge
sql/rpl_record.cc:
Manual merge
sql/slave.cc:
Manual merge
Diffstat (limited to 'sql/slave.h')
| -rw-r--r-- | sql/slave.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/sql/slave.h b/sql/slave.h index 68b00f65ded..2cd9ea352ba 100644 --- a/sql/slave.h +++ b/sql/slave.h @@ -138,10 +138,6 @@ bool flush_relay_log_info(Relay_log_info* rli); int register_slave_on_master(MYSQL* mysql); int terminate_slave_threads(Master_info* mi, int thread_mask, bool skip_lock = 0); -int terminate_slave_thread(THD* thd, pthread_mutex_t* term_mutex, - pthread_mutex_t* cond_lock, - pthread_cond_t* term_cond, - volatile uint* slave_running); int start_slave_threads(bool need_slave_mutex, bool wait_for_start, Master_info* mi, const char* master_info_fname, const char* slave_info_fname, int thread_mask); |