diff options
author | Andrei Elkin <aelkin@mysql.com> | 2009-12-14 18:32:22 +0200 |
---|---|---|
committer | Andrei Elkin <aelkin@mysql.com> | 2009-12-14 18:32:22 +0200 |
commit | c00bfe59b3b7b3f4c6c866aa4f8d81b277452bb4 (patch) | |
tree | 79f322d8853542fd99d6d35fcc14266afad722f2 /sql/rpl_rli.h | |
parent | f0ef41058c80f4c21a243f69ca8686956972e471 (diff) | |
parent | efc5e0a8a6df0b7d02bcd5d3e646dd7ccebd021e (diff) | |
download | mariadb-git-c00bfe59b3b7b3f4c6c866aa4f8d81b277452bb4.tar.gz |
merging 5.0-bt -> 5.1-bt to local branch with bug@47210
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 171778d9675..87516c366fb 100644 --- a/sql/rpl_rli.h +++ b/sql/rpl_rli.h @@ -303,7 +303,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 : |