summaryrefslogtreecommitdiff
path: root/sql/log.cc
diff options
context:
space:
mode:
authorheikki@hundin.mysql.fi <>2003-04-04 10:14:06 +0300
committerheikki@hundin.mysql.fi <>2003-04-04 10:14:06 +0300
commit17d1a669ed4866bf113984f05f2eecd6a8f28d3f (patch)
tree758a95ce6ad028db6aac2516d0b86335f0e2fb48 /sql/log.cc
parentcb68a2c7b168411d3345846cb7e52432e58c0d64 (diff)
downloadmariadb-git-17d1a669ed4866bf113984f05f2eecd6a8f28d3f.tar.gz
log.cc:
Fix crash in previous bug fix log.cc reported by Rob Lyon if --skip-innodb is specified
Diffstat (limited to 'sql/log.cc')
-rw-r--r--sql/log.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/log.cc b/sql/log.cc
index 2cb2e37be08..8a5aba5cd34 100644
--- a/sql/log.cc
+++ b/sql/log.cc
@@ -1132,7 +1132,8 @@ bool MYSQL_LOG::write(Log_event* event_info)
was a MyISAM event!
*/
- if (file == &log_file && !my_b_tell(&thd->transaction.trans_log))
+ if (file == &log_file && opt_using_transactions
+ && !my_b_tell(&thd->transaction.trans_log))
{
/*
LOAD DATA INFILE in AUTOCOMMIT=1 mode writes to the binlog