summaryrefslogtreecommitdiff
path: root/sql/slave.h
diff options
context:
space:
mode:
authorAndrei Elkin <aelkin@mysql.com>2009-11-12 17:10:19 +0200
committerAndrei Elkin <aelkin@mysql.com>2009-11-12 17:10:19 +0200
commit41a125474facfe7d6403a737fa32e491e2b44c3d (patch)
treeab45a9bfc2849e5605f4856f8059a8f829ff15a9 /sql/slave.h
parent8fc8d661a154dc63efec88cd89cd086dc467d5f2 (diff)
downloadmariadb-git-41a125474facfe7d6403a737fa32e491e2b44c3d.tar.gz
Bug #47210 first execution of "start slave until" stops too early
Until-pos guarding did not distiguish the master originated events from ones that the slave can introduce to the relay log e.g Rotate to the next relay log at slave restarting. The local Rotate's coordinate are incomparable with the Until-master-pos. That led to the unexpectable stop this bug describes. Fixed with to avoid Until-master-pos comparison for a local slave's event. Notice that if --replicate-same-server is true such event is treated as coming from the master side.
Diffstat (limited to 'sql/slave.h')
-rw-r--r--sql/slave.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/slave.h b/sql/slave.h
index 5ae596f1eb5..78627214eef 100644
--- a/sql/slave.h
+++ b/sql/slave.h
@@ -348,7 +348,7 @@ typedef struct st_relay_log_info
void close_temporary_tables();
/* Check if UNTIL condition is satisfied. See slave.cc for more. */
- bool is_until_satisfied(my_off_t master_beg_pos);
+ bool is_until_satisfied(THD *thd, Log_event *ev);
inline ulonglong until_pos()
{
return ((until_condition == UNTIL_MASTER_POS) ? group_master_log_pos :