diff options
| author | Alexey Kopytov <Alexey.Kopytov@Sun.com> | 2009-12-16 16:47:07 +0300 |
|---|---|---|
| committer | Alexey Kopytov <Alexey.Kopytov@Sun.com> | 2009-12-16 16:47:07 +0300 |
| commit | f1e83a4163458f7e25c709403cc7c7b48a7ef23e (patch) | |
| tree | fa68ffcd1dbdaf248e483a5692358fe7330ec507 /sql/rpl_rli.h | |
| parent | bcedf962ff7d22dd4d921a099fa38feeacc01b0b (diff) | |
| parent | 8b19de0de10094b25be63cd6a9a1d61517602f0b (diff) | |
| download | mariadb-git-f1e83a4163458f7e25c709403cc7c7b48a7ef23e.tar.gz | |
Manual merge of mysql-5.1-bugteam into mysql-trunk-merge.
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 fd36d18adae..60b55533926 100644 --- a/sql/rpl_rli.h +++ b/sql/rpl_rli.h @@ -316,7 +316,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 : |