bzr push into mysql-6.0-falcon branch (cpowers:2802 to 2803)

[Christopher Powers]

 2803 Christopher Powers	2008-08-27
      Fixed crash in StorageInterface::getDemographics()
      Fixed compile warning in RecordVersion::thaw()
modified:
  storage/falcon/RecordVersion.cpp
  storage/falcon/ha_falcon.cpp

 2802 Christopher Powers	2008-08-27 [merge]
      (no message)

=== modified file 'storage/falcon/RecordVersion.cpp'
--- a/storage/falcon/RecordVersion.cpp	2008-08-27 07:08:18 +0000
+++ b/storage/falcon/RecordVersion.cpp	2008-08-27 12:55:46 +0000
@@ -368,8 +368,6 @@ int RecordVersion::thaw()
 	// true, then the record data can be restored from the serial log. If writePending
 	// is false, then the record data has been written to the data pages.
 	
-	bool wasWritePending = (trans) ? trans->writePending : false;
-
 	if (trans && trans->writePending)
 		{
 		trans->addRef();

=== modified file 'storage/falcon/ha_falcon.cpp'
--- a/storage/falcon/ha_falcon.cpp	2008-08-22 12:55:22 +0000
+++ b/storage/falcon/ha_falcon.cpp	2008-08-27 12:55:46 +0000
@@ -670,7 +670,6 @@ int StorageInterface::info(uint what)
 	DBUG_RETURN(0);
 }
 
-
 void StorageInterface::getDemographics(void)
 {
 	DBUG_ENTER("StorageInterface::getDemographics");
@@ -693,7 +692,7 @@ void StorageInterface::getDemographics(v
 			{
 			ha_rows rows = 1 << indexDesc->numberSegments;
 
-			for (uint segment = 0; segment < key->key_parts; ++segment, rows >>= 1)
+			for (uint segment = 0; segment < indexDesc->numberSegments /*key->key_parts*/; ++segment, rows >>= 1)
 				{
 				ha_rows recordsPerSegment = (ha_rows)indexDesc->segmentRecordCounts[segment];
 				key->rec_per_key[segment] = (ulong) MAX(recordsPerSegment, rows);