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

[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-06-06 18:35:36-04:00, jas@rowvwade. +6 -0
  Work in progress shaking down internal table space code.

  storage/falcon/SRLCreateIndex.cpp@stripped, 2007-06-06 18:35:19-04:00, jas@rowvwade. +1 -6
    Eliminate obsolete version checks in serial log records.

  storage/falcon/SRLCreateSection.cpp@stripped, 2007-06-06 18:35:20-04:00, jas@rowvwade. +1 -1
    Pick up correct tableSpaceId (duh).

  storage/falcon/SRLDeleteIndex.cpp@stripped, 2007-06-06 18:35:20-04:00, jas@rowvwade. +1 -5
    Eliminate obsolete version checks in serial log records.

  storage/falcon/SRLIndexAdd.cpp@stripped, 2007-06-06 18:35:21-04:00, jas@rowvwade. +1 -6
    Eliminate obsolete version checks in serial log records.

  storage/falcon/SRLIndexDelete.cpp@stripped, 2007-06-06 18:35:21-04:00, jas@rowvwade. +15 -14
    Eliminate obsolete version checks in serial log records.

  storage/falcon/SRLVersion.h@stripped, 2007-06-06 18:35:21-04:00, jas@rowvwade. +1 -1
    Annotate srlVersion8 with the date (aka Ann's birthday).

# 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.8/storage/falcon/SRLCreateIndex.cpp	2007-06-06 18:35:58 -04:00
+++ 1.9/storage/falcon/SRLCreateIndex.cpp	2007-06-06 18:35:58 -04:00
@@ -58,12 +58,7 @@
 		tableSpaceId = 0;
 
 	indexId = getInt();
-
-	if (control->version >= srlVersion6)
-		indexVersion = getInt();
-	else
-		indexVersion = INDEX_VERSION_1;
-		
+	indexVersion = getInt();
 	transactionId = getInt();
 }
 

--- 1.10/storage/falcon/SRLDeleteIndex.cpp	2007-06-06 18:35:58 -04:00
+++ 1.11/storage/falcon/SRLDeleteIndex.cpp	2007-06-06 18:35:58 -04:00
@@ -66,11 +66,7 @@
 
 	transactionId = getInt();
 	indexId = getInt();
-
-	if (control->version >= srlVersion6)
-		indexVersion = getInt();
-	else
-		indexVersion = INDEX_VERSION_1;
+	indexVersion = getInt();
 }
 
 void SRLDeleteIndex::pass1()

--- 1.11/storage/falcon/SRLIndexAdd.cpp	2007-06-06 18:35:58 -04:00
+++ 1.12/storage/falcon/SRLIndexAdd.cpp	2007-06-06 18:35:58 -04:00
@@ -68,12 +68,7 @@
 
 	transactionId = getInt();
 	indexId = getInt();
-	
-	if (control->version >= srlVersion6)
-		indexVersion = getInt();
-	else
-		indexVersion = INDEX_VERSION_1;
-
+	indexVersion = getInt();
 	recordId = getInt();
 	length = getInt();
 	data = getData(length);

--- 1.8/storage/falcon/SRLIndexDelete.cpp	2007-06-06 18:35:58 -04:00
+++ 1.9/storage/falcon/SRLIndexDelete.cpp	2007-06-06 18:35:58 -04:00
@@ -45,20 +45,6 @@
 
 }
 
-void SRLIndexDelete::read()
-{
-	indexId = getInt();
-	
-	if (control->version >= srlVersion6)
-		indexVersion = getInt();
-	else
-		indexVersion = INDEX_VERSION_1;
-
-	recordId = getInt();
-	length = getInt();
-	data = getData(length);
-}
-
 void SRLIndexDelete::append(Dbb *dbb, int32 indexId, int idxVersion, IndexKey *key, int32
recordNumber, TransId transactionId)
 {
 	START_RECORD(srlIndexDelete, "SRLIndexDelete::append");
@@ -69,6 +55,21 @@
 	putInt(key->keyLength);
 	log->putData(key->keyLength, key->key);
 }
+
+void SRLIndexDelete::read()
+{
+	if (control->version >= srlVersion7)
+		tableSpaceId = getInt();
+	else
+		tableSpaceId = 0;
+
+	indexId = getInt();
+	indexVersion = getInt();
+	recordId = getInt();
+	length = getInt();
+	data = getData(length);
+}
+
 
 void SRLIndexDelete::redo()
 {

--- 1.11/storage/falcon/SRLVersion.h	2007-06-06 18:35:58 -04:00
+++ 1.12/storage/falcon/SRLVersion.h	2007-06-06 18:35:58 -04:00
@@ -34,7 +34,7 @@
 static const int srlVersion5		= 5;	// Added locatorPageNumber to SRLDataPage
 static const int srlVersion6		= 6;	// Added index version number of SRLIndexUpdate,
SRLUpdateIndex, and SRLDeleteIndex
 static const int srlVersion7		= 7;	// Added xid to SRLPrepare	1/20/07
-static const int srlVersion8		= 8;	// Adding tableSpaceId to many classes
+static const int srlVersion8		= 8;	// Adding tableSpaceId to many classes	June 5, 2007
(Ann's birthday!)
 static const int srlCurrentVersion	= srlVersion8;
 
 class SRLVersion : public SerialLogRecord  

--- 1.16/storage/falcon/SRLCreateSection.cpp	2007-06-06 18:35:58 -04:00
+++ 1.17/storage/falcon/SRLCreateSection.cpp	2007-06-06 18:35:58 -04:00
@@ -44,7 +44,7 @@
 void SRLCreateSection::append(Dbb *dbb, TransId transId, int32 sectionId)
 {
 	START_RECORD(srlCreateSection, "SRLCreateSection::append");
-	log->setSectionActive(sectionId, tableSpaceId);
+	log->setSectionActive(sectionId, dbb->tableSpaceId);
 	//SerialLogTransaction *trans = 
 	log->getTransaction(transId);
 	putInt(dbb->tableSpaceId);