diff options
| author | unknown <serg@serg.mylan> | 2005-02-23 20:10:58 +0100 |
|---|---|---|
| committer | unknown <serg@serg.mylan> | 2005-02-23 20:10:58 +0100 |
| commit | 8c12108eb6e8c4517874799fa63279931240d6a5 (patch) | |
| tree | 6bab9fed41606e70a9eba108dc5d175f05e02ab4 /sql/log_event.cc | |
| parent | ab2d69cd43136852fd0e9207d18266cf25f6a83e (diff) | |
| parent | 5f882a6d1fbe36d9b77e71902966c1da967b333a (diff) | |
| download | mariadb-git-8c12108eb6e8c4517874799fa63279931240d6a5.tar.gz | |
Merge bk-internal:/home/bk/mysql-5.0
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
sql/log_event.cc:
Auto merged
Diffstat (limited to 'sql/log_event.cc')
| -rw-r--r-- | sql/log_event.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sql/log_event.cc b/sql/log_event.cc index bbf894c2385..fa193df40a2 100644 --- a/sql/log_event.cc +++ b/sql/log_event.cc @@ -3140,10 +3140,9 @@ void Xid_log_event::print(FILE* file, bool short_form, LAST_EVENT_INFO* last_eve #if defined(HAVE_REPLICATION) && !defined(MYSQL_CLIENT) int Xid_log_event::exec_event(struct st_relay_log_info* rli) { - rli->inc_event_relay_log_pos(); /* For a slave Xid_log_event is COMMIT */ mysql_log.write(thd,COM_QUERY,"COMMIT /* implicit, from Xid_log_event */"); - return end_trans(thd, COMMIT); + return end_trans(thd, COMMIT) || Log_event::exec_event(rli); } #endif /* !MYSQL_CLIENT */ |