diff options
author | unknown <mkindahl@dl145h.mysql.com> | 2008-02-07 08:48:31 +0100 |
---|---|---|
committer | unknown <mkindahl@dl145h.mysql.com> | 2008-02-07 08:48:31 +0100 |
commit | 3b44afb07f36580e652a92c90433a6cc80159e89 (patch) | |
tree | 2003869558d414b53187695c87f8ad0416bf07d2 /sql/slave.cc | |
parent | 5cb34d741d25280b101442b3dc63d8d5e845fd70 (diff) | |
parent | 7144184ced4774da6bdfb34d9c2bae510877cbe8 (diff) | |
download | mariadb-git-3b44afb07f36580e652a92c90433a6cc80159e89.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
Diffstat (limited to 'sql/slave.cc')
-rw-r--r-- | sql/slave.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/slave.cc b/sql/slave.cc index 5ac0a92ac29..ea0dde942da 100644 --- a/sql/slave.cc +++ b/sql/slave.cc @@ -1897,7 +1897,9 @@ int apply_event_and_update_pos(Log_event* ev, THD* thd, Relay_log_info* rli, if (!rli->is_fake) #endif { +#ifndef DBUG_OFF char buf[22]; +#endif DBUG_PRINT("info", ("update_pos error = %d", error)); DBUG_PRINT("info", ("group %s %s", llstr(rli->group_relay_log_pos, buf), |