diff options
| author | mats@romeo.(none) <> | 2006-12-21 19:36:28 +0100 |
|---|---|---|
| committer | mats@romeo.(none) <> | 2006-12-21 19:36:28 +0100 |
| commit | 8d4bddefd0b1b7ed780dd4ab7de1f966d4527fd0 (patch) | |
| tree | 9c48d811e5bac1a0fbe447b8ae9e1462dc428d7d /sql/slave.cc | |
| parent | 4722743cae0e19a3025d688e87a17159ba4a0b73 (diff) | |
| parent | be9ffb12da78f157793b4d7445b98ca732aa42da (diff) | |
| download | mariadb-git-8d4bddefd0b1b7ed780dd4ab7de1f966d4527fd0.tar.gz | |
Merge romeo.(none):/home/bk/b22864-mysql-5.1-new-rpl
into romeo.(none):/home/bk/merge-b22864-myql-5.1-new-rpl
Diffstat (limited to 'sql/slave.cc')
| -rw-r--r-- | sql/slave.cc | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/sql/slave.cc b/sql/slave.cc index 67e8ba20c4f..307503a46d8 100644 --- a/sql/slave.cc +++ b/sql/slave.cc @@ -33,6 +33,7 @@ int queue_event(MASTER_INFO* mi,const char* buf,ulong event_len); +#define FLAGSTR(V,F) ((V)&(F)?#F" ":"") #define MAX_SLAVE_RETRY_PAUSE 5 bool use_slave_mask = 0; @@ -1799,6 +1800,10 @@ static int exec_relay_log_event(THD* thd, RELAY_LOG_INFO* rli) if (!ev->when) ev->when = time(NULL); ev->thd = thd; // because up to this point, ev->thd == 0 + DBUG_PRINT("info", ("thd->options={ %s%s}", + FLAGSTR(thd->options, OPTION_NOT_AUTOCOMMIT), + FLAGSTR(thd->options, OPTION_BEGIN))); + exec_res = ev->exec_event(rli); DBUG_PRINT("info", ("exec_event result: %d", exec_res)); DBUG_ASSERT(rli->sql_thd==thd); |