signal slave thread to stop during shutdown

c0b4b236 · sasha@mysql.sashanet.com · ab632586 · c0b4b236
Commit c0b4b236 authored Jul 11, 2001 by sasha@mysql.sashanet.com
Hide whitespace changes
Inline Side-by-side

Showing with 10 additions and 2 deletions

sql/slave.cc sql/slave.cc +10 -2

No files found.
--- a/sql/slave.cc
+++ b/sql/slave.cc
@@ -191,8 +191,16 @@ static void free_string_array(DYNAMIC_ARRAY *a)
 void end_slave()
 {
  pthread_mutex_lock(&LOCK_slave);
-  while (slave_running)
+  if (slave_running)
-    pthread_cond_wait(&COND_slave_stopped, &LOCK_slave);
+  {
+    abort_slave = 1;
+    thr_alarm_kill(slave_real_id);
+#ifdef SIGNAL_WITH_VIO_CLOSE
+    slave_thd->close_active_vio();
+#endif    
+    while (slave_running)
+      pthread_cond_wait(&COND_slave_stopped, &LOCK_slave);
+  }
  pthread_mutex_unlock(&LOCK_slave);
  end_master_info(&glob_mi);