bk commit into 6.0 tree (cpowers:1.2668)

[cpowers]

Below is the list of changes that have just been committed into a local
6.0 repository of cpowers.  When cpowers 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-05-06 18:37:54-05:00, cpowers@stripped +1 -0
  Fixed regressions in TableSpaceManager that affect the Falcon
  tablespace tables in the Information Schema.

  storage/falcon/TableSpaceManager.cpp@stripped, 2008-05-06 18:37:52-05:00, cpowers@stripped +11 -11
    Fix regressions in TableSpaceManager::findTable, getTableSpaceInfo and getTableSpaceFilesInfo.

diff -Nrup a/storage/falcon/TableSpaceManager.cpp b/storage/falcon/TableSpaceManager.cpp
--- a/storage/falcon/TableSpaceManager.cpp	2008-04-24 15:18:16 -05:00
+++ b/storage/falcon/TableSpaceManager.cpp	2008-05-06 18:37:52 -05:00
@@ -110,9 +110,9 @@ TableSpace* TableSpaceManager::findTable
 	if (resultSet->next())
 		{
 		int n = 1;
-		int id = resultSet->getInt(n++);
-		const char *fileName = resultSet->getString(n++);
-		int type = resultSet->getInt(n++);
+		int id = resultSet->getInt(n++);					// tablespace id
+		const char *fileName = resultSet->getString(n++);	// filename
+		int type = TABLESPACE_TYPE_TABLESPACE;				// type (forced)
 		
 		TableSpaceInit tsInit;
 		/***
@@ -123,9 +123,9 @@ TableSpace* TableSpaceManager::findTable
 		tsInit.nodegroup	= resultSet->getInt(n++);
 		tsInit.wait			= resultSet->getInt(n++);
 		***/
-		tsInit.comment		= resultSet->getString(n++);
+		tsInit.comment		= resultSet->getString(n++);	// comment
 		
-		tableSpace = new TableSpace(database, name, id, fileName, 0, &tsInit);
+		tableSpace = new TableSpace(database, name, id, fileName, type, &tsInit);
 
 		if (type != TABLESPACE_TYPE_REPOSITORY)
 			try
@@ -487,8 +487,8 @@ void TableSpaceManager::getTableSpaceInf
 		
 	while (resultSet->next())
 		{
-		infoTable->putString(0, resultSet->getString(1));					// tablespace_name
-		infoTable->putString(1, tableSpaceType(resultSet->getString(1)));	// type
+		infoTable->putString(0, resultSet->getString(1));					// tablespace name
+		infoTable->putString(1, tableSpaceType(resultSet->getString(1)));	// type based upon name
 		infoTable->putString(2, resultSet->getString(2));					// comment
 		infoTable->putRecord();
 		}
@@ -502,10 +502,10 @@ void TableSpaceManager::getTableSpaceFil
 
 	while (resultSet->next())
 		{
-		infoTable->putString(0, resultSet->getString(1));					// tablespace_name
-		infoTable->putString(1, tableSpaceType(resultSet->getString(1)));	// type
-		infoTable->putInt(2, 1);											// file_id
-		infoTable->putString(3, resultSet->getString(2));					// file_name
+		infoTable->putString(0, resultSet->getString(1));					// tablespace name
+		infoTable->putString(1, tableSpaceType(resultSet->getString(1)));	// type based upon name
+		infoTable->putInt(2, 1);											// file id (unused for now)
+		infoTable->putString(3, resultSet->getString(2));					// file name
 		infoTable->putRecord();
 		}
 }