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 | efe619585840b27ef156b35f2be6ef3c9809d2e5 (patch) | |
| tree | fa68ffcd1dbdaf248e483a5692358fe7330ec507 /sql/rpl_rli.h | |
| parent | a1218bb782f646111c9302740b4c443e3fed6d88 (diff) | |
| parent | 8f32ccff6032e03782ad805b97328f2e5e047384 (diff) | |
| download | mariadb-git-efe619585840b27ef156b35f2be6ef3c9809d2e5.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 : |