bzr push into mysql-6.0-falcon branch (cpowers:2819 to 2820) Bug#39350

[Christopher Powers]

 2820 Christopher Powers	2008-09-10
      Bug #39350 Falcon: Releasing deferred indexes causes crash
        
      Fixed regression to last commit that prevented deferred indexes from being released.
modified:
  storage/falcon/Transaction.cpp

 2819 John H. Embretsen	2008-09-10 [merge]
      Merging http://lists.mysql.com/commits/53704 into updated falcon-team branch.
      "Fix test segment for ALTER ONLINE ADD UNIQUE INDEX in falcon_online_index.test."
modified:
  mysql-test/suite/falcon/r/falcon_online_index.result
  mysql-test/suite/falcon/t/falcon_online_index.test

=== modified file 'storage/falcon/Transaction.cpp'
--- a/storage/falcon/Transaction.cpp	2008-09-10 06:42:49 +0000
+++ b/storage/falcon/Transaction.cpp	2008-09-10 17:32:43 +0000
@@ -1502,6 +1502,7 @@ void Transaction::releaseDeferredIndexes
 		{
 		ASSERT(deferredIndex->transaction == this);
 		deferredIndexes = deferredIndex->nextInTransaction;
+		deferredIndex->detachTransaction();
 		deferredIndexCount--;
 		}
 }