List:Commits« Previous MessageNext Message »
From:ahristov Date:August 11 2006 2:52pm
Subject:bk commit into 5.1 tree (andrey:1.2251)
View as plain text  
Below is the list of changes that have just been committed into a local
5.1 repository of andrey. When andrey does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2006-08-11 16:51:50+02:00, andrey@stripped +1 -0
  Fix a crash of SHOW PROCESSLIST

  sql/event_scheduler.cc@stripped, 2006-08-11 16:51:44+02:00, andrey@stripped +6 -3
    Fix a crash when calling show processlist and an event thread is starting.
    Don't add the thread to threads before it is fully initialized.

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	andrey
# Host:	example.com
# Root:	/work/mysql-5.1-runtime-wl3337

--- 1.19/sql/event_scheduler.cc	2006-08-11 16:52:02 +02:00
+++ 1.20/sql/event_scheduler.cc	2006-08-11 16:52:02 +02:00
@@ -123,6 +123,12 @@
     VOID(sigemptyset(&set));                    // Get mask in use
   VOID(pthread_sigmask(SIG_UNBLOCK,&set,&thd->block_signals));
 #endif
+  pthread_mutex_lock(&LOCK_thread_count);
+  threads.append(thd);
+  thread_count++;
+  thread_running++;
+  pthread_mutex_unlock(&LOCK_thread_count);
+
   return FALSE;
 }
 
@@ -182,9 +188,6 @@
   thd->client_capabilities|= CLIENT_MULTI_RESULTS;
   pthread_mutex_lock(&LOCK_thread_count);
   thd->thread_id= thread_id++;
-  threads.append(thd);
-  thread_count++;
-  thread_running++;
   pthread_mutex_unlock(&LOCK_thread_count);
 
   /*
Thread
bk commit into 5.1 tree (andrey:1.2251)ahristov11 Aug