diff --git a/sql/log.cc b/sql/log.cc
index 35a5885ca0f..26cfdb615fe 100644
--- a/sql/log.cc
+++ b/sql/log.cc
@@ -1753,7 +1753,7 @@ static int binlog_rollback(handlerton *hton, THD *thd, bool all)
   */
   if (cache_mngr->stmt_cache.has_incident())
   {
-    mysql_bin_log.write_incident(thd, TRUE);
+    error= mysql_bin_log.write_incident(thd, TRUE);
     cache_mngr->reset_cache(&cache_mngr->stmt_cache);
   }
   else if (!cache_mngr->stmt_cache.empty())
diff --git a/sql/sql_udf.cc b/sql/sql_udf.cc
index 57c9110405a..d0e446fb157 100644
--- a/sql/sql_udf.cc
+++ b/sql/sql_udf.cc
@@ -531,8 +531,11 @@ int mysql_create_function(THD *thd,udf_func *udf)
 
   /* Binlog the create function. */
   if (write_bin_log(thd, TRUE, thd->query(), thd->query_length()))
+  {
+    /* Restore the state of binlog format */
+    thd->current_stmt_binlog_row_based= save_binlog_row_based;
     DBUG_RETURN(1);
-
+  }
   /* Restore the state of binlog format */
   thd->current_stmt_binlog_row_based= save_binlog_row_based;
   DBUG_RETURN(0);
@@ -612,8 +615,11 @@ int mysql_drop_function(THD *thd,const LEX_STRING *udf_name)
 
   /* Binlog the drop function. */
   if (write_bin_log(thd, TRUE, thd->query(), thd->query_length()))
+  {
+    /* Restore the state of binlog format */
+    thd->current_stmt_binlog_row_based= save_binlog_row_based;
     DBUG_RETURN(1);
-
+  }
   /* Restore the state of binlog format */
   thd->current_stmt_binlog_row_based= save_binlog_row_based;
   DBUG_RETURN(0);
diff --git a/sql/sql_update.cc b/sql/sql_update.cc
index 4e5941a87a0..97abf2cd89b 100644
--- a/sql/sql_update.cc
+++ b/sql/sql_update.cc
@@ -1868,6 +1868,7 @@ void multi_update::abort()
         into repl event.
       */
       int errcode= query_error_code(thd, thd->killed == THD::NOT_KILLED);
+      /* the error of binary logging is ignored */
       (void)thd->binlog_query(THD::ROW_QUERY_TYPE,
                         thd->query(), thd->query_length(),
                         transactional_tables, FALSE, FALSE, errcode);