diff options
| author | unknown <svoj@mysql.com/june.mysql.com> | 2008-02-27 21:46:06 +0400 |
|---|---|---|
| committer | unknown <svoj@mysql.com/june.mysql.com> | 2008-02-27 21:46:06 +0400 |
| commit | 83bcd5dfab83948353b2f30bfe497f0a92d31977 (patch) | |
| tree | f13c97ab1c6bbf24dc3fdd2734cd5b7fc1157126 /sql/rpl_rli.h | |
| parent | eec647badb68d4f5a2a73471de6ffbdbfb13b0b8 (diff) | |
| download | mariadb-git-83bcd5dfab83948353b2f30bfe497f0a92d31977.tar.gz | |
BUG#13861 - START SLAVE UNTIL may stop 1 evnt too late if
log-slave-updates and circul repl
After merge fixes.
mysql-test/suite/rpl/t/rpl_dual_pos_advance-slave.opt:
Rename: mysql-test/t/rpl_dual_pos_advance-slave.opt -> mysql-test/suite/rpl/t/rpl_dual_pos_advance-slave.opt
mysql-test/include/wait_for_slave_sql_to_stop.inc:
Do not change connection if it was requested by caller (needed for
circular replication tests).
mysql-test/suite/rpl/t/rpl_dual_pos_advance.test:
Let include/wait_for_slave_sql_to_stop.inc know that we do not want to
change connection to slave.
sql/rpl_rli.cc:
After merge fix.
sql/rpl_rli.h:
After merge fix.
sql/slave.cc:
After merge fix.
Diffstat (limited to 'sql/rpl_rli.h')
| -rw-r--r-- | sql/rpl_rli.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/rpl_rli.h b/sql/rpl_rli.h index 36daffae1af..e13ea93842c 100644 --- a/sql/rpl_rli.h +++ b/sql/rpl_rli.h @@ -296,7 +296,7 @@ public: void close_temporary_tables(); /* Check if UNTIL condition is satisfied. See slave.cc for more. */ - bool is_until_satisfied(); + bool is_until_satisfied(my_off_t master_beg_pos); inline ulonglong until_pos() { return ((until_condition == UNTIL_MASTER_POS) ? group_master_log_pos : |