diff options
| author | unknown <serg@serg.mylan> | 2005-03-17 10:10:26 +0100 |
|---|---|---|
| committer | unknown <serg@serg.mylan> | 2005-03-17 10:10:26 +0100 |
| commit | 278e691ba885480cb1ab0879d1464ecbd8d3803f (patch) | |
| tree | 1e4b938c835c2e9f36217f1ea7a33219b0a6da48 /sql/log_event.cc | |
| parent | 2b466294e37e74ae0abfa61eec468d39d0d3c534 (diff) | |
| parent | 94ad6930fbbd04ee5ef7892beab89347c578f6e5 (diff) | |
| download | mariadb-git-278e691ba885480cb1ab0879d1464ecbd8d3803f.tar.gz | |
Automerge
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 | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/log_event.cc b/sql/log_event.cc index ba018e859c1..500408f34a7 100644 --- a/sql/log_event.cc +++ b/sql/log_event.cc @@ -2012,6 +2012,7 @@ int Format_description_log_event::exec_event(struct st_relay_log_info* rli) delete rli->relay_log.description_event_for_exec; rli->relay_log.description_event_for_exec= this; +#ifdef USING_TRANSACTIONS /* As a transaction NEVER spans on 2 or more binlogs: if we have an active transaction at this point, the master died @@ -2033,6 +2034,7 @@ int Format_description_log_event::exec_event(struct st_relay_log_info* rli) "to its binary log."); end_trans(thd, ROLLBACK); } +#endif /* If this event comes from ourselves, there is no cleaning task to perform, we don't call Start_log_event_v3::exec_event() (this was just to update the |