diff options
| author | Konstantin Osipov <kostja@sun.com> | 2010-02-02 12:22:17 +0300 |
|---|---|---|
| committer | Konstantin Osipov <kostja@sun.com> | 2010-02-02 12:22:17 +0300 |
| commit | c6c1ddabaf2d41b362921524d617fbc772c1c9b6 (patch) | |
| tree | 919a1043e20b3f1f6a58331ae90a4a9529b0ab5e /sql/rpl_rli.h | |
| parent | 665100b69dfebe45e2d3b68116c6718560bf63b2 (diff) | |
| parent | d4f23f0cf6db38731a161c5c7b0b056fc67e5c02 (diff) | |
| download | mariadb-git-c6c1ddabaf2d41b362921524d617fbc772c1c9b6.tar.gz | |
Merge next-mr -> next-4284.
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 949fa932127..f4111f0dae4 100644 --- a/sql/rpl_rli.h +++ b/sql/rpl_rli.h @@ -322,7 +322,7 @@ public: 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 : |