merge

1 files changed, 7 insertions, 0 deletions

diff --git a/sql/sql_load.cc b/sql/sql_load.cc
index a0f9ebbe39b..c227fe69b62 100644
--- a/sql/sql_load.cc
+++ b/sql/sql_load.cc
@@ -568,6 +568,13 @@ int mysql_load(THD *thd,sql_exchange *ex,TABLE_LIST *table_list,
                                                   transactional_table,
                                                   errcode);
       }
+
+      /*
+        Flushing the IO CACHE while writing the execute load query log event
+        may result in error (for instance, because the max_binlog_size has been 
+        reached, and rotation of the binary log failed).
+      */
+      error= error || mysql_bin_log.get_log_file()->error;
     }
     if (error)
       goto err;