summaryrefslogtreecommitdiff
path: root/sql/log.cc
diff options
context:
space:
mode:
authorunknown <serg@serg.mylan>2005-10-06 19:05:34 +0200
committerunknown <serg@serg.mylan>2005-10-06 19:05:34 +0200
commit970150d14e83b74e66cd61b9f77aa9c378a94ec7 (patch)
treeb367989349d1bc63f504fe364f7c296d758b7c7f /sql/log.cc
parentdf76450716d0550d8313f5d4afecd0e105558b5a (diff)
downloadmariadb-git-970150d14e83b74e66cd61b9f77aa9c378a94ec7.tar.gz
don't "init" binlog if opt_bin_log is not set
(bug#13791 - mysqld crashes at startup in TC_LOG_MMAP::open)
Diffstat (limited to 'sql/log.cc')
-rw-r--r--sql/log.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/log.cc b/sql/log.cc
index f352a38c393..8e9555cc9b2 100644
--- a/sql/log.cc
+++ b/sql/log.cc
@@ -66,7 +66,7 @@ handlerton binlog_hton = {
NULL, /* rollback_by_xid */
NULL, /* create_cursor_read_view */
NULL, /* set_cursor_read_view */
- NULL, /* close_cursor_read_view */
+ NULL, /* close_cursor_read_view */
HTON_NO_FLAGS
};
@@ -78,7 +78,7 @@ handlerton binlog_hton = {
bool binlog_init()
{
- return false;
+ return !opt_bin_log;
}
static int binlog_close_connection(THD *thd)