bk commit into 6.0 tree (chris:1.2719) BUG#32730

[cpowers]

Below is the list of changes that have just been committed into a local
6.0 repository of cpowers. When cpowers 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-12-02 12:40:58-06:00, chris@stripped +1 -0
  Bug#32730, Concurrent TRUNCATEs crash Falcon engine
  - Testcase 22173a triggered assert in SyncObject::unlock() because the lockstate was 0. Truncate
  locks are always Shared, so StorageTableShare::clearTruncateLock() now explicitly indicates the lock
  type to avoid the assert.

  storage/falcon/StorageTableShare.cpp@stripped, 2007-12-02 12:40:56-06:00, chris@stripped +1 -1
    Truncate locks are always Shared. Explicitly indicated shared lock in clearTruncateLock(). 

diff -Nrup a/storage/falcon/StorageTableShare.cpp b/storage/falcon/StorageTableShare.cpp
--- a/storage/falcon/StorageTableShare.cpp	2007-11-30 16:25:28 -06:00
+++ b/storage/falcon/StorageTableShare.cpp	2007-12-02 12:40:56 -06:00
@@ -527,6 +527,6 @@ void StorageTableShare::clearTruncateLoc
 	if (truncateLockCount > 0)
 		{
 		--truncateLockCount;
-		syncTruncate->unlock();
+		syncTruncate->unlock(NULL, Shared);
 		}
 }