summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuis Soares <luis.soares@oracle.com>2010-12-07 15:48:18 +0000
committerLuis Soares <luis.soares@oracle.com>2010-12-07 15:48:18 +0000
commitbd0709cc8726e2d189df71138488ff7b2b004460 (patch)
tree83063a758c62c31bc796419b933dac312fbe2827
parent5a63ecaf7e82ae7f42f88bf2feea68de4b91ae66 (diff)
downloadmariadb-git-bd0709cc8726e2d189df71138488ff7b2b004460.tar.gz
BUG#46166
Post merge fix. In write_incident, check if binlog file is opened before actually trying to write the incident event.
-rw-r--r--sql/log.cc4
1 files changed, 4 insertions, 0 deletions
diff --git a/sql/log.cc b/sql/log.cc
index 46dcec2e2cd..5fcb5fe0367 100644
--- a/sql/log.cc
+++ b/sql/log.cc
@@ -4828,6 +4828,10 @@ bool MYSQL_BIN_LOG::write_incident(THD *thd, bool lock)
{
uint error= 0;
DBUG_ENTER("MYSQL_BIN_LOG::write_incident");
+
+ if (!is_open())
+ DBUG_RETURN(error);
+
LEX_STRING const write_error_msg=
{ C_STRING_WITH_LEN("error writing to the binary log") };
Incident incident= INCIDENT_LOST_EVENTS;