diff options
| author | unknown <mats@kindahl-laptop.dnsalias.net> | 2007-10-24 16:54:18 +0200 |
|---|---|---|
| committer | unknown <mats@kindahl-laptop.dnsalias.net> | 2007-10-24 16:54:18 +0200 |
| commit | 06e82cb855d12ca4be16d6a191d0a0a1ed49138e (patch) | |
| tree | 9bd7245f36805ef4cc3c9c12dfa402d92bff3f76 /sql/slave.cc | |
| parent | 4a08f392145264021ad20908157072fbdc653908 (diff) | |
| parent | dcd1d492ba4b5c2e543bc1a4b3c2c10281cc7f99 (diff) | |
| download | mariadb-git-06e82cb855d12ca4be16d6a191d0a0a1ed49138e.tar.gz | |
Merge kindahl-laptop.dnsalias.net:/home/bkroot/mysql-5.1-rpl
into kindahl-laptop.dnsalias.net:/home/bk/b24860-mysql-5.1-rpl
sql/log_event.cc:
Auto merged
sql/log_event.h:
Auto merged
sql/slave.cc:
Auto merged
Diffstat (limited to 'sql/slave.cc')
| -rw-r--r-- | sql/slave.cc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/sql/slave.cc b/sql/slave.cc index 169cf897e6a..3b80a58676b 100644 --- a/sql/slave.cc +++ b/sql/slave.cc @@ -1863,10 +1863,13 @@ static int exec_relay_log_event(THD* thd, Relay_log_info* rli) // EVENT_SKIP_NOT, "not skipped", // EVENT_SKIP_IGNORE, - "skipped because event originated from this server", + "skipped because event should be ignored", // EVENT_SKIP_COUNT "skipped because event skip counter was non-zero" }; + DBUG_PRINT("info", ("OPTION_BEGIN: %d; IN_STMT: %d", + thd->options & OPTION_BEGIN ? 1 : 0, + rli->get_flag(Relay_log_info::IN_STMT))); DBUG_PRINT("skip_event", ("%s event was %s", ev->get_type_str(), explain[reason])); #endif |