diff options
| author | Alexander Nozdrin <alik@sun.com> | 2009-12-16 21:02:21 +0300 |
|---|---|---|
| committer | Alexander Nozdrin <alik@sun.com> | 2009-12-16 21:02:21 +0300 |
| commit | 09942fe8e89778e8b9ab99a8f0aa941a7fc95b16 (patch) | |
| tree | c656767fe54a976ffb669926348b9fac198be312 /sql/slave.cc | |
| parent | f0ae3168a3f2b16fd0718ca4b93533293c5deea8 (diff) | |
| parent | efe619585840b27ef156b35f2be6ef3c9809d2e5 (diff) | |
| download | mariadb-git-09942fe8e89778e8b9ab99a8f0aa941a7fc95b16.tar.gz | |
Manual merge from mysql-trunk-merge.
Conflicts:
- include/my_no_pthread.h
- mysql-test/r/sp-ucs2.result
- sql/log.cc
- sql/sql_acl.cc
- sql/sql_yacc.yy
Diffstat (limited to 'sql/slave.cc')
| -rw-r--r-- | sql/slave.cc | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/sql/slave.cc b/sql/slave.cc index 6d78d44f6f2..89e2fd8c302 100644 --- a/sql/slave.cc +++ b/sql/slave.cc @@ -2339,9 +2339,7 @@ static int exec_relay_log_event(THD* thd, Relay_log_info* rli) hits the UNTIL barrier. */ if (rli->until_condition != Relay_log_info::UNTIL_NONE && - rli->is_until_satisfied((rli->is_in_group() || !ev->log_pos) ? - rli->group_master_log_pos : - ev->log_pos - ev->data_written)) + rli->is_until_satisfied(thd, ev)) { char buf[22]; sql_print_information("Slave SQL thread stopped because it reached its" @@ -3139,7 +3137,7 @@ log '%s' at position %s, relay log '%s' position: %s", RPL_LOG_NAME, */ pthread_mutex_lock(&rli->data_lock); if (rli->until_condition != Relay_log_info::UNTIL_NONE && - rli->is_until_satisfied(rli->group_master_log_pos)) + rli->is_until_satisfied(thd, NULL)) { char buf[22]; sql_print_information("Slave SQL thread stopped because it reached its" |