diff options
| author | He Zhenxing <zhenxing.he@sun.com> | 2009-05-31 13:44:41 +0800 |
|---|---|---|
| committer | He Zhenxing <zhenxing.he@sun.com> | 2009-05-31 13:44:41 +0800 |
| commit | e1fb88f2cc6ac8350319a5c88810779573f381b3 (patch) | |
| tree | 7c9e10584a78c52b65d034c06dabe900f6c2c349 /sql/log.cc | |
| parent | 88e84c1fbfe9b60eeb9c3d24745ee31cfe29c38b (diff) | |
| parent | 5dd1abae7d2f9e56d1c3f54077057bd92387a600 (diff) | |
| download | mariadb-git-e1fb88f2cc6ac8350319a5c88810779573f381b3.tar.gz | |
Merge BUG#43263 from 5.0-bugteam to 5.1-bugteam
Diffstat (limited to 'sql/log.cc')
| -rw-r--r-- | sql/log.cc | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/sql/log.cc b/sql/log.cc index ed2eff6625d..6a1b425dbee 100644 --- a/sql/log.cc +++ b/sql/log.cc @@ -1502,7 +1502,8 @@ static int binlog_commit(handlerton *hton, THD *thd, bool all) YESNO(thd->transaction.stmt.modified_non_trans_table))); if (!in_transaction || all) { - Query_log_event qev(thd, STRING_WITH_LEN("COMMIT"), TRUE, FALSE); + Query_log_event qev(thd, STRING_WITH_LEN("COMMIT"), + TRUE, TRUE, THD::KILLED_NO_VALUE); qev.error_code= 0; // see comment in MYSQL_LOG::write(THD, IO_CACHE) error= binlog_end_trans(thd, trx_data, &qev, all); goto end; @@ -1557,7 +1558,8 @@ static int binlog_rollback(handlerton *hton, THD *thd, bool all) transactional table in that statement as well, which needs to be rolled back on the slave. */ - Query_log_event qev(thd, STRING_WITH_LEN("ROLLBACK"), TRUE, FALSE); + Query_log_event qev(thd, STRING_WITH_LEN("ROLLBACK"), + TRUE, TRUE, THD::KILLED_NO_VALUE); qev.error_code= 0; // see comment in MYSQL_LOG::write(THD, IO_CACHE) error= binlog_end_trans(thd, trx_data, &qev, all); } @@ -4370,7 +4372,7 @@ bool MYSQL_BIN_LOG::write(THD *thd, IO_CACHE *cache, Log_event *commit_event) transaction is either a BEGIN..COMMIT block or a single statement in autocommit mode. */ - Query_log_event qinfo(thd, STRING_WITH_LEN("BEGIN"), TRUE, FALSE); + Query_log_event qinfo(thd, STRING_WITH_LEN("BEGIN"), TRUE, TRUE); /* Imagine this is rollback due to net timeout, after all statements of the transaction succeeded. Then we want a |