From: Date: April 30 2008 3:56pm
Subject: bk commit into 6.0 tree (klewis:1.2659) BUG#36097
List-Archive: http://lists.mysql.com/commits/46227
X-Bug: 36097
Message-Id: <200804301356.m3UDuDXi021666@mail.mysql.com>

Below is the list of changes that have just been committed into a local
6.0 repository of klewis.  When klewis 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-04-30 08:55:32-05:00, klewis@klewis-mysql. +2 -0
  Bug#36097 - Be sure the highWater index is set to zero when a record is thawed.  
  Thawing memsets the field offset vector to zero and only addes the first offset,
  to the beginning of the record.  Record::getEncodedValue must have a zero 
  highWater offset so it will recalculate the offsets of the fields in that record.

  storage/falcon/Record.cpp@stripped, 2008-04-30 08:54:53-05:00, klewis@klewis-mysql. +1 -0
    Bug#36097 - Be sure the highWater index is set to zero when a record is thawed.  
    Thawing memsets the field offset vector to zero and only addes the first offset,
    to the beginning of the record.  Record::getEncodedValue must have a zero 
    highWater offset so it will recalculate the offsets of the fields in that record.

  storage/falcon/Table.cpp@stripped, 2008-04-30 08:54:57-05:00, klewis@klewis-mysql. +1 -1
    Cleanup

diff -Nrup a/storage/falcon/Record.cpp b/storage/falcon/Record.cpp
--- a/storage/falcon/Record.cpp	2008-04-24 23:25:05 -05:00
+++ b/storage/falcon/Record.cpp	2008-04-30 08:54:53 -05:00
@@ -863,6 +863,7 @@ int Record::setRecordData(const UCHAR * 
 	memset(dataBuffer, 0, vectorLength);
 	memcpy(dataBuffer + vectorLength, dataIn, dataLength);
 	((USHORT*) dataBuffer)[0] = (USHORT) (vectorLength + sizeof(short));
+	highWater = 0;
 	char **ptr = &data.record;
 	
 	// If data.record has changed since allocating the new buffer, then free the new buffer
diff -Nrup a/storage/falcon/Table.cpp b/storage/falcon/Table.cpp
--- a/storage/falcon/Table.cpp	2008-04-24 23:42:14 -05:00
+++ b/storage/falcon/Table.cpp	2008-04-30 08:54:57 -05:00
@@ -1201,7 +1201,7 @@ void Table::updateIndexes(Transaction *t
 **/
 void Table::insertIndexes(Transaction *transaction, RecordVersion *record)
 {
-    if (indexes)
+	if (indexes)
 		{
 		FOR_INDEXES(index, this);
 			Sync sync(&index->syncUnique, "Table::insertIndexes");