Revert "Bug#26589008 SYNC_BINLOG=0 SHOULD IGNORE BINLOG_GROUP_COMMIT_SYNC_DELAY"

This reverts commit 5654f5ec294f3d8ea087029ba9b47ad3eb2835b3.

Author: Venkatesh Duggirala

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

@@ -8,10 +8,6 @@ SET GLOBAL sync_binlog=1000;
 SET @clock_in = SYSDATE();
 SET @elapsed = TIMESTAMPDIFF(MICROSECOND, @clock_in, SYSDATE());
 include/assert.inc ["Assert that the above statements should not take more than 1000 seconds"]
-SET GLOBAL sync_binlog=0;
-SET @clock_in = SYSDATE();
-SET @elapsed = TIMESTAMPDIFF(MICROSECOND, @clock_in, SYSDATE());
-include/assert.inc ["Assert that the above statements should not take more than 1000 seconds"]
 SET GLOBAL binlog_group_commit_sync_delay=0;
 SET GLOBAL sync_binlog=1;
 DROP TABLE t1;

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

@@ -29,37 +29,23 @@ SET @elapsed = TIMESTAMPDIFF(MICROSECOND, @clock_in, SYSDATE());
 # But with fix, it should not take more than few seconds (that depends
 # on Pb2 machine speed and also depends on various build options too.
 #
-# Do above experiment with two iterations
-#  1) When sync_binlog > 1 (i.e., with 1000)
-#  2) When sync_binlog = 0
-#
 --let $group_count=1000
---let $iter=1
-while ($iter <= 2)
+--eval SET GLOBAL sync_binlog=$group_count
+--let $i=0
+
+SET @clock_in = SYSDATE();
+--disable_query_log
+while ($i <= $group_count)
 {
-  if ($iter == 1)
-  {
-    --eval SET GLOBAL sync_binlog=$group_count
-  }
-  if ($iter == 2)
-  {
-    --eval SET GLOBAL sync_binlog=0
-  }
-  --let $i=0
-  SET @clock_in = SYSDATE();
-  --disable_query_log
-  while ($i <= $group_count)
-  {
-    --eval INSERT INTO t1 VALUES ($i)
-    --inc $i
-  }
-  --enable_query_log
-  SET @elapsed = TIMESTAMPDIFF(MICROSECOND, @clock_in, SYSDATE());
-  --let $assert_text="Assert that the above statements should not take more than 1000 seconds"
-  --let $assert_cond= [SELECT @elapsed < 1000 * @@GLOBAL.binlog_group_commit_sync_delay]
-  --source include/assert.inc
-  --inc $iter
+  --eval INSERT INTO t1 VALUES ($i)
+  --inc $i
 }
+--enable_query_log
+SET @elapsed = TIMESTAMPDIFF(MICROSECOND, @clock_in, SYSDATE());
+--let $assert_text="Assert that the above statements should not take more than 1000 seconds"
+--let $assert_cond= [SELECT @elapsed < 1000 * @@GLOBAL.binlog_group_commit_sync_delay]
+--source include/assert.inc
+
 # End of Bug#21420180 test
 
 # Cleanup

sql/binlog.cc

@@ -9157,7 +9157,6 @@ int MYSQL_BIN_LOG::ordered_commit(THD *thd, bool all, bool skip_commit)
   int flush_error= 0, sync_error= 0;
   my_off_t total_bytes= 0;
   bool do_rotate= false;
-  unsigned int current_sync_period;
 
   /*
     These values are used while flushing a transaction, so clear
@@ -9304,9 +9303,11 @@ int MYSQL_BIN_LOG::ordered_commit(THD *thd, bool all, bool skip_commit)
     Shall introduce a delay only if it is going to do sync
     in this ongoing SYNC stage. The "+1" used below in the
     if condition is to count the ongoing sync stage.
+    When sync_binlog=0 (where we never do sync in BGC group),
+    it is considered as a special case and delay will be executed
+    for every group just like how it is done when sync_binlog= 1.
   */
-  current_sync_period= get_sync_period();
-  if (!flush_error && current_sync_period && (sync_counter + 1 >= current_sync_period))
+  if (!flush_error && (sync_counter + 1 >= get_sync_period()))
     stage_manager.wait_count_or_timeout(opt_binlog_group_commit_sync_no_delay_count,
                                         opt_binlog_group_commit_sync_delay,
                                         Stage_manager::SYNC_STAGE);