diff options
| author | Alfranio Correia <alfranio.correia@sun.com> | 2010-06-17 01:25:07 +0100 |
|---|---|---|
| committer | Alfranio Correia <alfranio.correia@sun.com> | 2010-06-17 01:25:07 +0100 |
| commit | cdc4e9ebce32aa41cef21d2f821959d6cd08e064 (patch) | |
| tree | 5072ba6ab5f2c0a1a636b09f62d1a845e9847eb2 /sql/log_event_old.cc | |
| parent | d2e58e4e49f4c42c3c6b1220ccc0004ed6963192 (diff) | |
| parent | 3f8bde448c6b97f073576e1283224c3058320dea (diff) | |
| download | mariadb-git-cdc4e9ebce32aa41cef21d2f821959d6cd08e064.tar.gz | |
merge mysql-5.1-bugteam (local) --> mysql-5.1-bugteam
Diffstat (limited to 'sql/log_event_old.cc')
| -rw-r--r-- | sql/log_event_old.cc | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/sql/log_event_old.cc b/sql/log_event_old.cc index 8376eb6c584..202b81989a8 100644 --- a/sql/log_event_old.cc +++ b/sql/log_event_old.cc @@ -229,11 +229,6 @@ Old_rows_log_event::do_apply_event(Old_rows_log_event *ev, const Relay_log_info DBUG_EXECUTE_IF("STOP_SLAVE_after_first_Rows_event", const_cast<Relay_log_info*>(rli)->abort_slave= 1;); error= do_after_row_operations(table, error); - if (!ev->cache_stmt) - { - DBUG_PRINT("info", ("Marked that we need to keep log")); - ev_thd->options|= OPTION_KEEP_LOG; - } } /* @@ -1775,11 +1770,6 @@ int Old_rows_log_event::do_apply_event(Relay_log_info const *rli) DBUG_EXECUTE_IF("STOP_SLAVE_after_first_Rows_event", const_cast<Relay_log_info*>(rli)->abort_slave= 1;); error= do_after_row_operations(rli, error); - if (!cache_stmt) - { - DBUG_PRINT("info", ("Marked that we need to keep log")); - thd->options|= OPTION_KEEP_LOG; - } } // if (table) /* |