diff options
| author | monty@mashka.mysql.fi <> | 2003-01-09 03:55:26 +0200 |
|---|---|---|
| committer | monty@mashka.mysql.fi <> | 2003-01-09 03:55:26 +0200 |
| commit | f8e660d88ca64d2f7a1be58acbe57d777d20b122 (patch) | |
| tree | af09adc5a3ec6814545553d72fda1d33e443d162 /sql/slave.cc | |
| parent | a10178493005b3fa69163ef39c6a58fe9ff6658b (diff) | |
| parent | 2ea43f3c53573a6482ea84556e11e5db6cedddef (diff) | |
| download | mariadb-git-f8e660d88ca64d2f7a1be58acbe57d777d20b122.tar.gz | |
merge with 4.0.9
To get bug fixes for TCP/IP connections, FORCE INDEX and OPTIMIZE TABLE with NULL keys
Diffstat (limited to 'sql/slave.cc')
| -rw-r--r-- | sql/slave.cc | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/sql/slave.cc b/sql/slave.cc index 342a35b8821..271fe8bc2d6 100644 --- a/sql/slave.cc +++ b/sql/slave.cc @@ -413,6 +413,7 @@ int terminate_slave_threads(MASTER_INFO* mi,int thread_mask,bool skip_lock) } if ((thread_mask & (SLAVE_IO|SLAVE_FORCE_ALL)) && mi->slave_running) { + DBUG_PRINT("info",("Terminating IO thread")); mi->abort_slave=1; if ((error=terminate_slave_thread(mi->io_thd,io_lock, io_cond_lock, @@ -423,6 +424,7 @@ int terminate_slave_threads(MASTER_INFO* mi,int thread_mask,bool skip_lock) } if ((thread_mask & (SLAVE_SQL|SLAVE_FORCE_ALL)) && mi->rli.slave_running) { + DBUG_PRINT("info",("Terminating SQL thread")); DBUG_ASSERT(mi->rli.sql_thd != 0) ; mi->rli.abort_slave=1; if ((error=terminate_slave_thread(mi->rli.sql_thd,sql_lock, @@ -2572,12 +2574,6 @@ static int process_io_rotate(MASTER_INFO *mi, Rotate_log_event *rev) memcpy(mi->master_log_name, rev->new_log_ident, rev->ident_len+1); mi->master_log_pos= rev->pos; - - pthread_mutex_lock(&mi->rli.data_lock); - memcpy(mi->rli.master_log_name, rev->new_log_ident, rev->ident_len+1); - mi->rli.master_log_pos= rev->pos; - pthread_mutex_unlock(&mi->rli.data_lock); - DBUG_PRINT("info", ("master_log_pos: '%s' %d", mi->master_log_name, (ulong) mi->master_log_pos)); #ifndef DBUG_OFF |