From: Date: November 2 2007 10:06pm
Subject: bk commit into 6.0 tree (chris:1.2681) BUG#29211
List-Archive: http://lists.mysql.com/commits/37020
X-Bug: 29211
Message-Id: <20071102210657.8BB771DB0674@xeno.mysql.com>

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-11-02 16:06:52-05:00, chris@stripped +2 -0
  Bug#29211, "Falcon: information_schema has a falcon_tables view"
  -Added INTERNAL_NAME column to Information_Schema.falcon_tables.

  storage/falcon/StorageHandler.cpp@stripped, 2007-11-02 16:06:50-05:00, chris@stripped +1 -0
    StorageHandler::getTablesInfo(): Added INTERNAL_NAME column.

  storage/falcon/ha_falcon.cpp@stripped, 2007-11-02 16:06:50-05:00, chris@stripped +1 -0
    tablesFieldInfo: Added INTERNAL_NAME column to falcon_tables view.

diff -Nrup a/storage/falcon/StorageHandler.cpp b/storage/falcon/StorageHandler.cpp
--- a/storage/falcon/StorageHandler.cpp	2007-10-31 12:44:16 -05:00
+++ b/storage/falcon/StorageHandler.cpp	2007-11-02 16:06:50 -05:00
@@ -966,6 +966,7 @@ void StorageHandler::getTablesInfo(InfoT
 			infoTable->putString(1, (pTable ? pTable : pStr));	// table
 			infoTable->putString(2, (pPart ? pPart : ""));		// partition
 			infoTable->putString(3, resultSet->getString(3));	// tablespace
+			infoTable->putString(4, resultSet->getString(2));	// internal name
 		
 			//for (int n = 0; n < 3; ++n)
 			//	infoTable->putString(n, resultSet->getString(n + 1));
diff -Nrup a/storage/falcon/ha_falcon.cpp b/storage/falcon/ha_falcon.cpp
--- a/storage/falcon/ha_falcon.cpp	2007-11-02 00:09:46 -05:00
+++ b/storage/falcon/ha_falcon.cpp	2007-11-02 16:06:50 -05:00
@@ -2581,6 +2581,7 @@ ST_FIELD_INFO tablesFieldInfo[]=
 	{"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},
+	{"INTERNAL_NAME", 127, MYSQL_TYPE_STRING,	0, 0, "Internal Name", SKIP_OPEN_TABLE},
 	{0,					0, MYSQL_TYPE_STRING,	0, 0, 0, SKIP_OPEN_TABLE}
 };