database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-12-24 11:21:21 +03:00
Code Activity

merging 5.0-bt -> 5.1-bt to local branch with bug@47210

Browse Source
This commit is contained in:
Andrei Elkin
2009-12-14 18:32:22 +02:00
parent 594f28a5e0 79c147f191
commit ad3d84e912
5 changed files with 101 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
sql/rpl_rli.cc
View File

@@ -1022,7 +1022,7 @@ err:
false - condition not met
*/
bool Relay_log_info::is_until_satisfied(my_off_t master_beg_pos)
bool Relay_log_info::is_until_satisfied(THD *thd, Log_event *ev)
{
const char *log_name;
ulonglong log_pos;
@@ -1032,8 +1032,12 @@ bool Relay_log_info::is_until_satisfied(my_off_t master_beg_pos)
if (until_condition == UNTIL_MASTER_POS)
{
if (ev && ev->server_id == (uint32) ::server_id && !replicate_same_server_id)
return FALSE;
log_name= group_master_log_name;
log_pos= master_beg_pos;
log_pos= (!ev)? group_master_log_pos :
((thd->options & OPTION_BEGIN || !ev->log_pos) ?
group_master_log_pos : ev->log_pos - ev->data_written);
}
else
{ /* until_condition == UNTIL_RELAY_POS */