Revert "Fixed PS-7873 (log_status table reports wrong gtid_executed)"

This reverts commit b7e7bd2.

Author: percona-ysorokin

mysql-test/suite/binlog_gtid/r/binlog_gtid_log_status_mismatch.result

@@ -8873,7 +8873,6 @@ void MYSQL_BIN_LOG::process_commit_stage_queue(THD *thd, THD *first) {
                          head->commit_error, YESNO(head->tx_commit_pending)));
   }
 
-  DEBUG_SYNC(thd, "process_commit_stage_queue_before_handle_gtid");
   /*
     Handle the GTID of the threads.
     gtid_executed table is kept updated even though transactions fail to be

mysql-test/suite/binlog_gtid/t/binlog_gtid_log_status_mismatch.test

@@ -978,7 +978,6 @@ class MYSQL_BIN_LOG : public TC_LOG {
   inline mysql_mutex_t *get_log_lock() { return &LOCK_log; }
   inline mysql_mutex_t *get_commit_lock() { return &LOCK_commit; }
   inline mysql_mutex_t *get_after_commit_lock() { return &LOCK_after_commit; }
-  inline mysql_mutex_t *get_sync_lock() { return &LOCK_sync; }
   inline mysql_cond_t *get_log_cond() { return &update_cond; }
   inline Binlog_ofile *get_binlog_file() { return m_binlog_file; }
 

sql/binlog.cc

@@ -22,7 +22,6 @@
    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
 
 #include "sql/log_resource.h"
-#include "debug_sync.h"
 #include "sql-common/json_dom.h"
 
 int MY_ATTRIBUTE((visibility("default")))
@@ -102,23 +101,12 @@ bool Log_resource_binlog_wrapper::collect_info() {
   return error;
 }
 
-void Log_resource_gtid_state_wrapper::lock() {
-  DEBUG_SYNC(current_thd, "log_resource_gtid_lock");
-  mysql_mutex_lock(binlog->get_sync_lock());
-  mysql_mutex_lock(binlog->get_commit_lock());
-  global_sid_lock->wrlock();
-}
+void Log_resource_gtid_state_wrapper::lock() { global_sid_lock->wrlock(); }
 
-void Log_resource_gtid_state_wrapper::unlock() {
-  global_sid_lock->unlock();
-  mysql_mutex_unlock(binlog->get_commit_lock());
-  mysql_mutex_unlock(binlog->get_sync_lock());
-}
+void Log_resource_gtid_state_wrapper::unlock() { global_sid_lock->unlock(); }
 
 bool Log_resource_gtid_state_wrapper::collect_info() {
   bool error = false;
-  mysql_mutex_assert_owner(binlog->get_sync_lock());
-  mysql_mutex_assert_owner(binlog->get_commit_lock());
   global_sid_lock->assert_some_wrlock();
 
   char *gtid_executed_string;
@@ -163,10 +151,9 @@ Log_resource *Log_resource_factory::get_wrapper(MYSQL_BIN_LOG *binlog,
 }
 
 Log_resource *Log_resource_factory::get_wrapper(Gtid_state *gtid_state,
-                                                MYSQL_BIN_LOG *binlog,
                                                 Json_dom *json) {
   Log_resource_gtid_state_wrapper *wrapper;
-  wrapper = new Log_resource_gtid_state_wrapper(gtid_state, binlog, json);
+  wrapper = new Log_resource_gtid_state_wrapper(gtid_state, json);
   return wrapper;
 }
 

sql/binlog.h

@@ -176,23 +176,19 @@ class Log_resource_binlog_wrapper : public Log_resource {
 */
 class Log_resource_gtid_state_wrapper : public Log_resource {
   Gtid_state *gtid_state = nullptr;
-  MYSQL_BIN_LOG *binlog = nullptr;
 
  public:
   /**
     Log_resource_gtid_state_wrapper constructor.
 
     @param[in] gtid_state_arg the pointer to the Gtid_state object resource.
-    @param[in] binlog_arg the pointer to the MYSQL_BIN_LOG object resource.
     @param[in] json_arg the pointer to the JSON object to be populated with the
                         resource log information.
   */
 
   Log_resource_gtid_state_wrapper(Gtid_state *gtid_state_arg,
-                                  MYSQL_BIN_LOG *binlog_arg, Json_dom *json_arg)
-      : Log_resource(json_arg),
-        gtid_state(gtid_state_arg),
-        binlog(binlog_arg) {}
+                                  Json_dom *json_arg)
+      : Log_resource(json_arg), gtid_state(gtid_state_arg) {}
 
   void lock() override;
   void unlock() override;
@@ -258,14 +254,12 @@ class Log_resource_factory {
     Creates a Log_resource wrapper based on a Gtid_state object.
 
     @param[in] gtid_state the pointer to the Gtid_state object resource.
-    @param[in] binlog the pointer to the MYSQL_BIN_LOG object resource.
     @param[in] json the pointer to the JSON object to be populated with the
                     resource log information.
     @return  the pointer to the new Log_resource.
   */
 
-  static Log_resource *get_wrapper(Gtid_state *gtid_state,
-                                   MYSQL_BIN_LOG *binlog, Json_dom *json);
+  static Log_resource *get_wrapper(Gtid_state *gtid_state, Json_dom *json);
 
   /**
     Creates a Log_resource wrapper based on a handlerton.

sql/log_resource.cc

@@ -226,8 +226,7 @@ int table_log_status::make_row() {
   */
   {
     Log_resource *res;
-    res = Log_resource_factory::get_wrapper(gtid_state, &mysql_bin_log,
-                                            &json_local);
+    res = Log_resource_factory::get_wrapper(gtid_state, &json_local);
     error = DBUG_EVALUATE_IF("log_status_oom_gtid", 1, !res);
     if (error) {
       my_error(ER_UNABLE_TO_COLLECT_LOG_STATUS, MYF(0), "LOCAL",