summaryrefslogtreecommitdiff
path: root/sql/rpl_rli.h
diff options
context:
space:
mode:
authorAndrei Elkin <aelkin@mysql.com>2009-12-14 18:32:22 +0200
committerAndrei Elkin <aelkin@mysql.com>2009-12-14 18:32:22 +0200
commitad3d84e91220574794bc949662351c6ceab5498c (patch)
tree79f322d8853542fd99d6d35fcc14266afad722f2 /sql/rpl_rli.h
parent594f28a5e053f33d98d63844bf4f3da732235ebe (diff)
parent79c147f191586ef4d2113ffd0fd37206ca1daa20 (diff)
downloadmariadb-git-ad3d84e91220574794bc949662351c6ceab5498c.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.h2
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 :