bk commit into 6.0-falcon tree (jas:1.2524)

[U-ROWVWADEjas]

Below is the list of changes that have just been committed into a local
6.0-falcon repository of . When  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, 2007-05-15 17:22:32-04:00, jas@rowvwade. +3 -0
  Work around logging deadlock report SyncObject stall.

  storage/falcon/SyncObject.cpp@stripped, 2007-05-15 17:22:23-04:00, jas@rowvwade. +3 -4
    Work around logging deadlock report SyncObject stall.

  storage/falcon/Thread.cpp@stripped, 2007-05-15 17:22:23-04:00, jas@rowvwade. +3 -1
    Work around logging deadlock report SyncObject stall.

  storage/falcon/Thread.h@stripped, 2007-05-15 17:22:24-04:00, jas@rowvwade. +1 -0
    Work around logging deadlock report SyncObject stall.

# 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:	jas
# Host:	rowvwade.
# Root:	D:/MySQL/mysql-5.1-falcon

--- 1.24/storage/falcon/SyncObject.cpp	2007-05-15 17:22:51 -04:00
+++ 1.25/storage/falcon/SyncObject.cpp	2007-05-15 17:22:51 -04:00
@@ -344,13 +344,13 @@
 void SyncObject::stalled(Thread *thread)
 {
 #ifdef TRACE
+	mutex.lock();
 	ThreadState threadState;
 	thread->saveState(&threadState);
-	Sync *lockPending = thread->lockPending;
 	
 	Sync sync(&Log::syncObject, "SyncObject::stalled");
 	sync.lock(Exclusive);
-	mutex.lock();
+	
 	LinkedList threads;
 	LinkedList syncObjects;
 	thread->findLocks (threads, syncObjects);
@@ -368,10 +368,9 @@
 	END_FOR;
 
 	LOG_DEBUG ("------------------------------------\n");
+	thread->restoreState(&threadState);
 	mutex.release();
 
-	thread->restoreState(&threadState);
-	thread->lockPending = lockPending;
 #endif
 }
 

--- 1.20/storage/falcon/Thread.cpp	2007-05-15 17:22:51 -04:00
+++ 1.21/storage/falcon/Thread.cpp	2007-05-15 17:22:51 -04:00
@@ -519,11 +519,13 @@
 	state->threadQue = que;
 	state->lockType = lockType;
 	state->lockGranted = lockGranted;
+	state->lockPending = lockPending;
 }
 
 void Thread::restoreState(ThreadState* state)
 {
 	que = state->threadQue;
 	lockType = state->lockType;
-	lockGranted = state->lockGranted ;
+	lockGranted = state->lockGranted;
+	lockPending = state->lockPending;
 }

--- 1.10/storage/falcon/Thread.h	2007-05-15 17:22:51 -04:00
+++ 1.11/storage/falcon/Thread.h	2007-05-15 17:22:51 -04:00
@@ -45,6 +45,7 @@
 struct ThreadState 
 	{
 	Thread		*threadQue;
+	Sync		*lockPending;
 	LockType	lockType;
 	bool		lockGranted;
 	};