diff options
| author | aelkin/elkin@koti.dsl.inet.fi <> | 2007-10-13 23:12:50 +0300 |
|---|---|---|
| committer | aelkin/elkin@koti.dsl.inet.fi <> | 2007-10-13 23:12:50 +0300 |
| commit | 8f7550ecad8e6dee0f7fb36592ba1d3a330e8f39 (patch) | |
| tree | adc8c2380bbdfc9ef9c087786ffc2ac0c79073c0 /sql/rpl_rli.cc | |
| parent | a7b1a823a5f5099bce93f4a985b79aa82d1c57e1 (diff) | |
| download | mariadb-git-8f7550ecad8e6dee0f7fb36592ba1d3a330e8f39.tar.gz | |
manual merge for bug_29136, bug#29309.
Diffstat (limited to 'sql/rpl_rli.cc')
| -rw-r--r-- | sql/rpl_rli.cc | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/sql/rpl_rli.cc b/sql/rpl_rli.cc index 867d55a60a3..15d7d97affd 100644 --- a/sql/rpl_rli.cc +++ b/sql/rpl_rli.cc @@ -1082,6 +1082,9 @@ bool Relay_log_info::cached_charset_compare(char *charset) const void Relay_log_info::stmt_done(my_off_t event_master_log_pos, time_t event_creation_time) { +#ifndef DBUG_OFF + extern uint debug_not_change_ts_if_art_event; +#endif clear_flag(IN_STMT); /* @@ -1121,7 +1124,12 @@ void Relay_log_info::stmt_done(my_off_t event_master_log_pos, is that value may take some time to display in Seconds_Behind_Master - not critical). */ - last_master_timestamp= event_creation_time; +#ifndef DBUG_OFF + if (!(event_creation_time == 0 && debug_not_change_ts_if_art_event > 0)) +#else + if (event_creation_time != 0) +#endif + last_master_timestamp= event_creation_time; } } |