Merge branch 'mysql-5.6' into mysql-5.7

(cherry picked from commit e040ef09b9e9dc63946bf2497bf39127ec18ea79)

Author: Joao Gramacho

mysql-test/suite/binlog/r/binlog_rotate_bgc_sync.result

@@ -7,7 +7,7 @@ SET DEBUG_SYNC= 'NOW WAIT_FOR holding_before_bgc_sync_binlog_file';
 SET DEBUG_SYNC= 'before_rotate_binlog_file SIGNAL holding_before_rotate_binlog_file WAIT_FOR continue_rotate_binlog_file';
 FLUSH LOGS;
 [connection default]
-SET DEBUG_SYNC= 'now WAIT_FOR holding_before_rotate_binlog_file TIMEOUT 3';
+SET DEBUG_SYNC= 'now WAIT_FOR holding_before_rotate_binlog_file';
 SET DEBUG_SYNC= 'now SIGNAL continue_bgc_sync_binlog_file';
 SET DEBUG_SYNC= 'before_rotate_binlog_file CLEAR';
 SET DEBUG_SYNC = 'now SIGNAL continue_rotate_binlog_file';
@@ -25,7 +25,7 @@ SET DEBUG_SYNC= 'NOW WAIT_FOR holding_before_bgc_sync_binlog_file';
 SET DEBUG_SYNC= 'before_rotate_binlog_file SIGNAL holding_before_rotate_binlog_file WAIT_FOR continue_rotate_binlog_file';
 FLUSH LOGS;
 [connection default]
-SET DEBUG_SYNC= 'now WAIT_FOR holding_before_rotate_binlog_file TIMEOUT 3';
+SET DEBUG_SYNC= 'now WAIT_FOR holding_before_rotate_binlog_file';
 SET DEBUG_SYNC= 'now SIGNAL continue_bgc_sync_binlog_file';
 SET DEBUG_SYNC= 'before_rotate_binlog_file CLEAR';
 SET DEBUG_SYNC = 'now SIGNAL continue_rotate_binlog_file';

mysql-test/suite/binlog/t/binlog_rotate_bgc_sync.test

@@ -62,9 +62,7 @@ while ($engine)
   # binary log
   --let $rpl_connection_name= default
   --source include/rpl_connection.inc
-  --disable_warnings
-  SET DEBUG_SYNC= 'now WAIT_FOR holding_before_rotate_binlog_file TIMEOUT 3';
-  --enable_warnings
+  SET DEBUG_SYNC= 'now WAIT_FOR holding_before_rotate_binlog_file';
 
   # Let the binary log group commit to sync and continue
   SET DEBUG_SYNC= 'now SIGNAL continue_bgc_sync_binlog_file';

sql/binlog.cc

@@ -8417,8 +8417,24 @@ MYSQL_BIN_LOG::sync_binlog_file(bool force)
   if (force || (sync_period && ++sync_counter >= sync_period))
   {
     sync_counter= 0;
+
+    /**
+      On *pure non-transactional* workloads there is a small window
+      in time where a concurrent rotate might be able to close
+      the file before the sync is actually done. In that case,
+      ignore the bad file descriptor errors.
+
+      Transactional workloads (InnoDB) are not affected since the
+      the rotation will not happen until all transactions have
+      committed to the storage engine, thence decreased the XID
+      counters.
+
+      TODO: fix this properly even for non-transactional storage
+            engines.
+     */
     if (DBUG_EVALUATE_IF("simulate_error_during_sync_binlog_file", 1,
-                         mysql_file_sync(log_file.file, MYF(MY_WME))))
+                         mysql_file_sync(log_file.file,
+                                         MYF(MY_WME | MY_IGNORE_BADFD))))
     {
       THD *thd= current_thd;
       thd->commit_error= THD::CE_SYNC_ERROR;
@@ -8756,7 +8772,6 @@ int MYSQL_BIN_LOG::ordered_commit(THD *thd, bool all, bool skip_commit)
   mysql_mutex_t *leave_mutex_before_commit_stage= NULL;
   my_off_t flush_end_pos= 0;
   bool update_binlog_end_pos_after_sync;
-  bool need_LOCK_log;
   if (unlikely(!is_open()))
   {
     final_queue= stage_manager.fetch_queue_for(Stage_manager::FLUSH_STAGE);
@@ -8814,16 +8829,8 @@ int MYSQL_BIN_LOG::ordered_commit(THD *thd, bool all, bool skip_commit)
   /*
     Stage #2: Syncing binary log file to disk
   */
-  need_LOCK_log= sync_counter + 1 >= get_sync_period() && get_prep_xids() == 0;
 
-  /*
-    LOCK_log is not released also when we are about to sync the binary log and
-    there is no transactional storage engine prepared transactions. This will
-    guarantee that the binary log rotation will not take place before syncing
-    the binary log file.
-  */
-  if (change_stage(thd, Stage_manager::SYNC_STAGE, wait_queue,
-                   need_LOCK_log ? NULL : &LOCK_log, &LOCK_sync))
+  if (change_stage(thd, Stage_manager::SYNC_STAGE, wait_queue, &LOCK_log, &LOCK_sync))
   {
     DBUG_PRINT("return", ("Thread ID: %u, commit_error: %d",
                           thd->thread_id(), thd->commit_error));
@@ -8854,9 +8861,6 @@ int MYSQL_BIN_LOG::ordered_commit(THD *thd, bool all, bool skip_commit)
       update_binlog_end_pos(tmp_thd->get_trans_pos());
   }
 
-  if (need_LOCK_log)
-    mysql_mutex_unlock(&LOCK_log);
-
   DEBUG_SYNC(thd, "bgc_after_sync_stage_before_commit_stage");
 
   leave_mutex_before_commit_stage= &LOCK_sync;