Commit 6c5e6dab authored by unknown's avatar unknown
Browse files

Remove old hack to avoid reception of SUB_DATA signals to destroyed Ndb object

parent ad53646d

sql/ha_ndbcluster_binlog.cc

+1 −26
Original line number Diff line number Diff line
@@ -3958,10 +3958,6 @@ pthread_handler_t ndb_binlog_thread_func(void *arg) 
  close_thread_tables(thd);

  pthread_mutex_lock(&injector_mutex);

  /* don't mess with the injector_ndb anymore from other threads */

  uint ndb_obj_cnt= 1; // g_ndb

  ndb_obj_cnt+= injector_ndb == 0 ? 0 : 1;

  ndb_obj_cnt+= schema_ndb == 0 ? 0 : 1;

  ndb_obj_cnt+= ndbcluster_util_inited ? 1 : 0;

  injector_thd= 0;

  injector_ndb= 0;

  p_latest_trans_gci= 0;
@@ -3969,28 +3965,7 @@ pthread_handler_t ndb_binlog_thread_func(void *arg) 
  pthread_mutex_unlock(&injector_mutex);

  thd->db= 0; // as not to try to free memory



  if (!ndb_extra_logging)

  sql_print_information("Stopping Cluster Binlog");

  else

    sql_print_information("Stopping Cluster Binlog: %u(%u)", 

			  g_ndb_cluster_connection->get_active_ndb_objects(), 

			  ndb_obj_cnt);



  /**

   * Add extra wait loop to make user "user" ndb-object go away...

   *   otherwise user thread can have ongoing SUB_DATA

   */

  int sleep_cnt= 0;

  while (sleep_cnt < 300 &&

         g_ndb_cluster_connection->get_active_ndb_objects() > ndb_obj_cnt)

  {

    my_sleep(10000); // 10ms

    sleep_cnt++;

  }

  if (ndb_extra_logging)

    sql_print_information("Stopping Cluster Binlog: waited %ums %u(%u)", 

			  10*sleep_cnt, g_ndb_cluster_connection->get_active_ndb_objects(), 

			  ndb_obj_cnt);



  if (ndb_apply_status_share)

  {