bk commit into 6.0 tree (jas:1.2817)

[U-ROWVWADEjas]

Below is the list of changes that have just been committed into a local
6.0 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, 2008-02-15 17:44:02-05:00, jas@rowvwade. +2 -0
  A couple of editting changes resulting from a bk merge.

  storage/falcon/Database.cpp@stripped, 2008-02-15 17:43:53-05:00, jas@rowvwade. +1 -0
    Add missing include of "BackLog.h"

  storage/falcon/Transaction.cpp@stripped, 2008-02-15 17:43:54-05:00, jas@rowvwade. +3 -3
    Fix bk-butchered merge.

diff -Nrup a/storage/falcon/Database.cpp b/storage/falcon/Database.cpp
--- a/storage/falcon/Database.cpp	2008-02-15 17:32:10 -05:00
+++ b/storage/falcon/Database.cpp	2008-02-15 17:43:53 -05:00
@@ -77,6 +77,7 @@
 #include "SyncTest.h"
 #include "PriorityScheduler.h"
 #include "Sequence.h"
+#include "BackLog.h"
 
 #ifdef _WIN32
 #define PATH_MAX			_MAX_PATH
diff -Nrup a/storage/falcon/Transaction.cpp b/storage/falcon/Transaction.cpp
--- a/storage/falcon/Transaction.cpp	2008-02-15 17:32:51 -05:00
+++ b/storage/falcon/Transaction.cpp	2008-02-15 17:43:54 -05:00
@@ -1075,6 +1075,9 @@ void Transaction::releaseSavepoints(void
 		{
 		savePoints = savePoint->next;
 		
+		if (savePoint->savepoints)
+			savePoint->clear();
+			
 		if (savePoint < localSavePoints || savePoint >= localSavePoints + LOCAL_SAVE_POINTS)
 			delete savePoint;
 		}
@@ -1340,9 +1343,6 @@ void Transaction::validateDependencies(b
 			ASSERT(!noDependencies);
 			ASSERT(state->transaction->transactionId == state->transactionId);
 			}
-		
-		if (savePoint->savepoints)
-			savePoint->clear();
 }
 
 void Transaction::printBlockage(void)