summaryrefslogtreecommitdiff
path: root/sql/log_event.cc
diff options
context:
space:
mode:
authorAlfranio Correia <alfranio.correia@sun.com>2010-06-17 01:25:07 +0100
committerAlfranio Correia <alfranio.correia@sun.com>2010-06-17 01:25:07 +0100
commitcdc4e9ebce32aa41cef21d2f821959d6cd08e064 (patch)
tree5072ba6ab5f2c0a1a636b09f62d1a845e9847eb2 /sql/log_event.cc
parentd2e58e4e49f4c42c3c6b1220ccc0004ed6963192 (diff)
parent3f8bde448c6b97f073576e1283224c3058320dea (diff)
downloadmariadb-git-cdc4e9ebce32aa41cef21d2f821959d6cd08e064.tar.gz
merge mysql-5.1-bugteam (local) --> mysql-5.1-bugteam
Diffstat (limited to 'sql/log_event.cc')
-rw-r--r--sql/log_event.cc6
1 files changed, 0 insertions, 6 deletions
diff --git a/sql/log_event.cc b/sql/log_event.cc
index 9c6de5bb42e..5ff4b50c6df 100644
--- a/sql/log_event.cc
+++ b/sql/log_event.cc
@@ -7560,12 +7560,6 @@ int Rows_log_event::do_apply_event(Relay_log_info const *rli)
clear_all_errors(thd, const_cast<Relay_log_info*>(rli));
error= 0;
}
-
- if (!cache_stmt)
- {
- DBUG_PRINT("info", ("Marked that we need to keep log"));
- thd->options|= OPTION_KEEP_LOG;
- }
} // if (table)
/*