bzr push into mysql-5.6-next-mr branch (mikael:2924 to 2926) WL#5138

[Mikael Ronstrom]

 2926 Mikael Ronstrom	2009-11-20
      WL#5138, reverted some review fixes

    modified:
      sql/mysql_priv.h
      sql/mysqld.cc
 2925 Mikael Ronstrom	2009-11-20
      WL#5138, review fixes

    modified:
      sql/event_scheduler.cc
      sql/mysql_priv.h
      sql/mysqld.cc
 2924 Mikael Ronstrom	2009-11-20 [merge]
      WL#5138 merged to mysql-next-mr

    removed:
      include/atomic/x86-msvc.h
    added:
      include/atomic/generic-msvc.h
      unittest/mysys/thr_template.c
    modified:
      include/Makefile.am
      include/atomic/gcc_builtins.h
      include/atomic/nolock.h
      include/atomic/rwlock.h
      include/atomic/solaris.h
      include/atomic/x86-gcc.h
      include/my_atomic.h
      include/my_global.h
      sql/event_scheduler.cc
      sql/log_event.cc
      sql/mysql_priv.h
      sql/mysqld.cc
      sql/sp_head.cc
      sql/sql_parse.cc
      unittest/mysys/Makefile.am
      unittest/mysys/my_atomic-t.c
=== modified file 'sql/event_scheduler.cc'
--- a/sql/event_scheduler.cc	2009-11-20 15:23:32 +0000
+++ b/sql/event_scheduler.cc	2009-11-20 15:43:21 +0000
@@ -158,12 +158,12 @@ deinit_event_thread(THD *thd)
   DBUG_PRINT("exit", ("Event thread finishing"));
   pthread_mutex_lock(&LOCK_thread_count);
   thread_count--;
-  delete thd;
-  pthread_cond_broadcast(&COND_thread_count);
-  pthread_mutex_unlock(&LOCK_thread_count);
   my_atomic_rwlock_wrlock(&global_query_id_lock);
   dec_thread_running();
   my_atomic_rwlock_wrunlock(&global_query_id_lock);
+  delete thd;
+  pthread_cond_broadcast(&COND_thread_count);
+  pthread_mutex_unlock(&LOCK_thread_count);
 }
 
 
@@ -421,12 +421,12 @@ Event_scheduler::start()
     net_end(&new_thd->net);
     pthread_mutex_lock(&LOCK_thread_count);
     thread_count--;
-    delete new_thd;
-    pthread_cond_broadcast(&COND_thread_count);
-    pthread_mutex_unlock(&LOCK_thread_count);
     my_atomic_rwlock_wrlock(&global_query_id_lock);
     dec_thread_running();
     my_atomic_rwlock_wrunlock(&global_query_id_lock);
+    delete new_thd;
+    pthread_cond_broadcast(&COND_thread_count);
+    pthread_mutex_unlock(&LOCK_thread_count);
   }
 end:
   UNLOCK_DATA();
@@ -556,12 +556,12 @@ error:
     net_end(&new_thd->net);
     pthread_mutex_lock(&LOCK_thread_count);
     thread_count--;
-    delete new_thd;
-    pthread_cond_broadcast(&COND_thread_count);
-    pthread_mutex_unlock(&LOCK_thread_count);
     my_atomic_rwlock_wrlock(&global_query_id_lock);
     dec_thread_running();
     my_atomic_rwlock_wrunlock(&global_query_id_lock);
+    delete new_thd;
+    pthread_cond_broadcast(&COND_thread_count);
+    pthread_mutex_unlock(&LOCK_thread_count);
   }
   delete event_name;
   DBUG_RETURN(TRUE);


Attachment: [text/bzr-bundle] bzr/[e-mail]