database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge

Browse Source
This commit is contained in:
Mikael Ronstrom
2009-12-14 17:08:30 +01:00
parent 32b9defd3c 376cf4275f
commit 1568f5721c
500 changed files with 95164 additions and 154332 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sql/log_event.cc
View File

@ -5869,7 +5869,7 @@ Slave_log_event::Slave_log_event(const char* buf, uint event_len)
int Slave_log_event::do_apply_event(Relay_log_info const *rli)
{
if (mysql_bin_log.is_open())
mysql_bin_log.write(this);
return mysql_bin_log.write(this);
return 0;
}
#endif /* !MYSQL_CLIENT */
@ -7598,7 +7598,7 @@ static int rows_event_stmt_cleanup(Relay_log_info const *rli, THD * thd)
(assume the last master's transaction is ignored by the slave because of
replicate-ignore rules).
*/
thd->binlog_flush_pending_rows_event(true);
error= thd->binlog_flush_pending_rows_event(true);
/*
If this event is not in a transaction, the call below will, if some
@ -7609,7 +7609,7 @@ static int rows_event_stmt_cleanup(Relay_log_info const *rli, THD * thd)
are involved, commit the transaction and flush the pending event to the
binlog.
*/
error= ha_autocommit_or_rollback(thd, 0);
error|= ha_autocommit_or_rollback(thd, error);
/*
Now what if this is not a transactional engine? we still need to