diff options
author | mats@romeo.(none) <> | 2007-03-22 09:05:11 +0100 |
---|---|---|
committer | mats@romeo.(none) <> | 2007-03-22 09:05:11 +0100 |
commit | 68ebc7e49577a5e447cc1a1f66566282d7c5c7da (patch) | |
tree | 95f7524f2b6c4cbacd479d5c251d41b542a2b26f /sql/sql_binlog.cc | |
parent | 11d37efa5e117c5f64870a00ec56b438b7e4dca9 (diff) | |
parent | 2ee007ba9d0eb8517a43d767bf2ec4b7fcdad5ad (diff) | |
download | mariadb-git-68ebc7e49577a5e447cc1a1f66566282d7c5c7da.tar.gz |
Merge romeo.(none):/home/bkroot/mysql-5.1-new-rpl
into romeo.(none):/home/bk/b23171-mysql-5.1-new-rpl
Diffstat (limited to 'sql/sql_binlog.cc')
-rw-r--r-- | sql/sql_binlog.cc | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/sql/sql_binlog.cc b/sql/sql_binlog.cc index b0a54bec664..6f7bbda96de 100644 --- a/sql/sql_binlog.cc +++ b/sql/sql_binlog.cc @@ -163,9 +163,17 @@ void mysql_client_binlog_statement(THD* thd) (ulong) uint4korr(bufptr+EVENT_LEN_OFFSET))); #endif ev->thd= thd; - if (IF_DBUG(int err= ) ev->exec_event(thd->rli_fake)) + /* + We go directly to the application phase, since we don't need + to check if the event shall be skipped or not. + + Neither do we have to update the log positions, since that is + not used at all: the rli_fake instance is used only for error + reporting. + */ + if (IF_DBUG(int err= ) ev->apply_event(thd->rli_fake)) { - DBUG_PRINT("error", ("exec_event() returned: %d", err)); + DBUG_PRINT("info", ("apply_event() returned: %d", err)); /* TODO: Maybe a better error message since the BINLOG statement now contains several events. |