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

[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-07-06 13:26:48-04:00, jas@rowvwade. +1 -0
  Record::getRecord() was using the sizeof(Record) to compute
  the actual record length.  It should have been using either
  sizeof(Record) or sizeof(RecordVersion) as appropriate.
  
  This fixes a Valgrind warning.

  storage/falcon/Record.cpp@stripped, 2007-07-06 13:26:40-04:00, jas@rowvwade. +7 -9
    Record::getRecord() was using the sizeof(Record) to compute
    the actual record length.  It should have been using either
    sizeof(Record) or sizeof(RecordVersion) as appropriate.
    
    This fixes a Valgrind warning.

# 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.47/storage/falcon/Record.cpp	2007-07-06 13:27:09 -04:00
+++ 1.48/storage/falcon/Record.cpp	2007-07-06 13:27:09 -04:00
@@ -600,7 +600,7 @@
 			break;
 
 		case shortVector:
-			stream->putSegment(size - format->count * sizeof(USHORT) - sizeof(*this),
+			stream->putSegment(getEncodedSize(),
 							   data.record + ((USHORT*) data.record)[0] - sizeof(short), false);
 			break;
 
@@ -611,21 +611,19 @@
 
 int Record::getEncodedSize()
 {
-	int encodedSize;
 	switch (encoding)
 		{
 		case traditional:
-			encodedSize = format->length;
-			break;
+			return format->length;
 
 		case shortVector:
-			encodedSize = size - format->count*sizeof(USHORT) - sizeof(*this);
-			break;
+			return size - format->count * sizeof(USHORT) - ((isVersion()) ? sizeof(RecordVersion) : sizeof(Record));
 
 		default:
-			encodedSize = 0;
+			NOT_YET_IMPLEMENTED;
+			
+			return 0;
 		}
-	return (encodedSize);
 }
 
 void Record::getEncodedValue(int fieldId, Value *value)
@@ -880,7 +878,7 @@
 
 char* Record::getRecordData()
 {
-	return(data.record);
+	return data.record;
 }
 
 void Record::deleteData(void)