diff options
| author | unknown <mkindahl@dl145h.mysql.com> | 2008-02-07 07:30:06 +0100 |
|---|---|---|
| committer | unknown <mkindahl@dl145h.mysql.com> | 2008-02-07 07:30:06 +0100 |
| commit | 5cb34d741d25280b101442b3dc63d8d5e845fd70 (patch) | |
| tree | 16ceb8cbd1e4eaf8770cc2bad62be016f4c08aee /sql/slave.cc | |
| parent | ea7ecda29b0d8e542e8d309acf500c05f29a5445 (diff) | |
| parent | be5a46a69b63eebfd4413e43a4f6a7b3c0c0bcd0 (diff) | |
| download | mariadb-git-5cb34d741d25280b101442b3dc63d8d5e845fd70.tar.gz | |
Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.1
into dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl
sql/slave.cc:
Auto merged
sql/sql_binlog.cc:
Auto merged
Diffstat (limited to 'sql/slave.cc')
| -rw-r--r-- | sql/slave.cc | 22 |
1 files changed, 14 insertions, 8 deletions
diff --git a/sql/slave.cc b/sql/slave.cc index 4ba18428751..5ac0a92ac29 100644 --- a/sql/slave.cc +++ b/sql/slave.cc @@ -1893,14 +1893,19 @@ int apply_event_and_update_pos(Log_event* ev, THD* thd, Relay_log_info* rli, if (exec_res == 0) { int error= ev->update_pos(rli); - char buf[22]; - DBUG_PRINT("info", ("update_pos error = %d", error)); - DBUG_PRINT("info", ("group %s %s", - llstr(rli->group_relay_log_pos, buf), - rli->group_relay_log_name)); - DBUG_PRINT("info", ("event %s %s", - llstr(rli->event_relay_log_pos, buf), - rli->event_relay_log_name)); +#ifdef HAVE_purify + if (!rli->is_fake) +#endif + { + char buf[22]; + DBUG_PRINT("info", ("update_pos error = %d", error)); + DBUG_PRINT("info", ("group %s %s", + llstr(rli->group_relay_log_pos, buf), + rli->group_relay_log_name)); + DBUG_PRINT("info", ("event %s %s", + llstr(rli->event_relay_log_pos, buf), + rli->event_relay_log_name)); + } /* The update should not fail, so print an error message and return an error code. @@ -1910,6 +1915,7 @@ int apply_event_and_update_pos(Log_event* ev, THD* thd, Relay_log_info* rli, */ if (error) { + char buf[22]; rli->report(ERROR_LEVEL, ER_UNKNOWN_ERROR, "It was not possible to update the positions" " of the relay log information: the slave may" |