diff options
| author | Alexander Nozdrin <alik@sun.com> | 2010-07-29 16:32:11 +0400 |
|---|---|---|
| committer | Alexander Nozdrin <alik@sun.com> | 2010-07-29 16:32:11 +0400 |
| commit | dfc63866eb91ce5274647dc1176e2f98b5954a50 (patch) | |
| tree | 16a66be92ba2603896b1b010600df021911be256 /sql/slave.cc | |
| parent | 14b769cfc6bcf5e6b3142d12e26667bcec90b2cd (diff) | |
| parent | c33caca3a45cb72ed3354561d4ff9f06dc12466c (diff) | |
| download | mariadb-git-dfc63866eb91ce5274647dc1176e2f98b5954a50.tar.gz | |
Auto-merge from mysql-trunk-merge.
Diffstat (limited to 'sql/slave.cc')
| -rw-r--r-- | sql/slave.cc | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/sql/slave.cc b/sql/slave.cc index 7cf5ea9ab9f..dff6b6946d4 100644 --- a/sql/slave.cc +++ b/sql/slave.cc @@ -3262,11 +3262,8 @@ log '%s' at position %s, relay log '%s' position: %s", RPL_LOG_NAME, mysql_mutex_lock(&rli->data_lock); if (rli->slave_skip_counter) { - char *pos; - pos= strmake(saved_log_name, rli->group_relay_log_name, FN_REFLEN - 1); - pos= '\0'; - pos= strmake(saved_master_log_name, rli->group_master_log_name, FN_REFLEN - 1); - pos= '\0'; + strmake(saved_log_name, rli->group_relay_log_name, FN_REFLEN - 1); + strmake(saved_master_log_name, rli->group_master_log_name, FN_REFLEN - 1); saved_log_pos= rli->group_relay_log_pos; saved_master_log_pos= rli->group_master_log_pos; saved_skip= rli->slave_skip_counter; |