summaryrefslogtreecommitdiff
path: root/sql/log_event.cc
diff options
context:
space:
mode:
authorAlfranio Correia <alfranio.correia@sun.com>2010-06-27 18:31:42 +0100
committerAlfranio Correia <alfranio.correia@sun.com>2010-06-27 18:31:42 +0100
commit11d658d10a1dbf89243d2cf564ec2e056f016c8f (patch)
treeedf7935a7731d766ce435c9b2ae5e40fa7416836 /sql/log_event.cc
parent95e5c8688e5afdad73d114ea2061e0fc85754c38 (diff)
parentb5660249aff5dca8c07f33b843a0f2d5a18cd10d (diff)
downloadmariadb-git-11d658d10a1dbf89243d2cf564ec2e056f016c8f.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 cdf059b5e1f..c5bbe324ae8 100644
--- a/sql/log_event.cc
+++ b/sql/log_event.cc
@@ -7625,12 +7625,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)
/*