bzr commit into mysql-6.0-falcon-team branch (christopher.powers:2996)

[Christopher Powers]

#At file:///home/cpowers/work/dev/dev-04/mysql/

 2996 Christopher Powers	2009-02-02 [merge]
      merge
modified:
  storage/falcon/SyncObject.cpp

=== modified file 'storage/falcon/SyncObject.cpp'
--- a/storage/falcon/SyncObject.cpp	2009-01-27 17:32:40 +0000
+++ b/storage/falcon/SyncObject.cpp	2009-02-01 20:54:27 +0000
@@ -652,6 +652,7 @@ void SyncObject::wait(LockType type, Thr
 						}
 
 				mutex.release();
+				thread->lockPending = NULL;
 				timedout(timeout);
 				}
 			}