mirror of
https://github.com/MariaDB/server.git
synced 2026-05-06 15:15:34 +02:00
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.
This commit is contained in:
parent
eec647badb
commit
83bcd5dfab
6 changed files with 19 additions and 10 deletions
|
|
@ -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 :
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue