diff options
| author | unknown <serg@serg.mylan> | 2005-02-22 00:17:56 +0100 |
|---|---|---|
| committer | unknown <serg@serg.mylan> | 2005-02-22 00:17:56 +0100 |
| commit | 06f3307b45bc4f5ad557f2efe79a12d327e66e2d (patch) | |
| tree | 0a1e797b5a95237312d077399738392494918e5f /sql/log_event.cc | |
| parent | 8a3c137b5e34ff52cdbd890ee3b9201360667c93 (diff) | |
| parent | 3ad8d4ba881717d3045cdd170b3828bd0db67b2e (diff) | |
| download | mariadb-git-06f3307b45bc4f5ad557f2efe79a12d327e66e2d.tar.gz | |
Merge bk-internal:/home/bk/mysql-5.0
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
sql/log.cc:
Auto merged
sql/log_event.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
Diffstat (limited to 'sql/log_event.cc')
| -rw-r--r-- | sql/log_event.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/log_event.cc b/sql/log_event.cc index 6df6986fd8c..7b030de6839 100644 --- a/sql/log_event.cc +++ b/sql/log_event.cc @@ -1452,7 +1452,7 @@ int Query_log_event::exec_event(struct st_relay_log_info* rli) thd->variables.pseudo_thread_id= thread_id; // for temp tables mysql_log.write(thd,COM_QUERY,"%s",thd->query); DBUG_PRINT("query",("%s",thd->query)); - + if (ignored_error_code((expected_error= error_code)) || !check_expected_error(thd,rli,expected_error)) { @@ -3139,6 +3139,7 @@ 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); } #endif /* !MYSQL_CLIENT */ |