bk commit into 6.0 tree (chris:1.2656) BUG#29211

[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, 2007-10-31 02:06:53-05:00, chris@stripped +2 -0
  Bug#29211 "Falcon: information_schema has a falcon_tables view"
  - Put table and partition in separate columns

  storage/falcon/StorageHandler.cpp@stripped, 2007-10-31 02:06:51-05:00, chris@stripped +33 -2
    StorageHandler::getTablesInfo()
    - Put table and partition name and put in separate columns

  storage/falcon/ha_falcon.cpp@stripped, 2007-10-31 02:06:51-05:00, chris@stripped +1 -0
    Added PARTITION column to Information_Schema.falcon_tables.

diff -Nrup a/storage/falcon/StorageHandler.cpp b/storage/falcon/StorageHandler.cpp
--- a/storage/falcon/StorageHandler.cpp	2007-10-23 18:14:09 -05:00
+++ b/storage/falcon/StorageHandler.cpp	2007-10-31 02:06:51 -05:00
@@ -914,8 +914,39 @@ void StorageHandler::getTablesInfo(InfoT
 		
 		while (resultSet->next())
 			{
-			for (int n = 0; n < 3; ++n)
-				infoTable->putString(n, resultSet->getString(n + 1));
+
+			// Parse table and partition name
+			
+			const char *pStr = resultSet->getString(2);
+			char *pTable = NULL;
+			char *pPart = NULL;
+			
+			if (pStr)
+				{
+				const int max_buf = 1024;
+				char buffer[max_buf+1];
+				
+				pTable = buffer;
+				*pTable = 0;
+				strncpy(buffer, pStr, (size_t)max_buf);
+				
+				char *pBuf = strchr(buffer, '#');
+				
+				if (pBuf)
+					{
+					*pBuf = 0;
+					if ((pPart = strrchr(++pBuf, '#')) != NULL)
+						pPart++;
+					}
+				}
+					
+			infoTable->putString(0, resultSet->getString(1));	// database
+			infoTable->putString(1, (pTable ? pTable : pStr));	// table
+			infoTable->putString(2, (pPart ? pPart : ""));		// partition
+			infoTable->putString(3, resultSet->getString(3));	// tablespace
+		
+			//for (int n = 0; n < 3; ++n)
+			//	infoTable->putString(n, resultSet->getString(n + 1));
 			
 			infoTable->putRecord();
 			}
diff -Nrup a/storage/falcon/ha_falcon.cpp b/storage/falcon/ha_falcon.cpp
--- a/storage/falcon/ha_falcon.cpp	2007-10-27 10:10:03 -05:00
+++ b/storage/falcon/ha_falcon.cpp	2007-10-31 02:06:51 -05:00
@@ -2571,6 +2571,7 @@ ST_FIELD_INFO tablesFieldInfo[]=
 {
 	{"SCHEMA_NAME",	  127, MYSQL_TYPE_STRING,	0, 0, "Schema Name", SKIP_OPEN_TABLE},
 	{"TABLE_NAME",	  127, MYSQL_TYPE_STRING,	0, 0, "Table Name", SKIP_OPEN_TABLE},
+	{"PARTITION",	  127, MYSQL_TYPE_STRING,	0, 0, "Partition Name", SKIP_OPEN_TABLE},
 	{"TABLESPACE",	  127, MYSQL_TYPE_STRING,	0, 0, "Tablespace", SKIP_OPEN_TABLE},
 	{0,					0, MYSQL_TYPE_STRING,	0, 0, 0, SKIP_OPEN_TABLE}
 };