bk commit into 5.1-falcon tree (jas:1.2587)

[U-ROWVWADEjas]

Below is the list of changes that have just been committed into a local
5.1-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-04-12 15:40:07-04:00, jas@rowvwade. +1 -0
  Don't try to share common field structures for information
  schema plugins.

  storage/falcon/ha_falcon.cpp@stripped, 2007-04-12 15:40:01-04:00, jas@rowvwade. +27 -2
    Don't try to share common field structures for information
    schema plugins.

# 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.144/storage/falcon/ha_falcon.cpp	2007-04-12 15:40:23 -04:00
+++ 1.145/storage/falcon/ha_falcon.cpp	2007-04-12 15:40:23 -04:00
@@ -2326,6 +2326,7 @@
 // Record cache usage detail
 //
 //*****************************************************************************
+
 int NfsPluginHandler::call_fillRecordCacheDetailTable(THD *thd, TABLE_LIST *tables, COND *cond)
 {
 	InfoTable infoTable(thd, tables, system_charset_info);
@@ -2333,11 +2334,24 @@
 	
 	return infoTable.error;
 }
+
+ST_FIELD_INFO recordDetailFieldInfo[]=
+{
+	{"FILE",		  120, MYSQL_TYPE_STRING,	0, 0, "File"},
+	{"LINE",			4, MYSQL_TYPE_LONG,		0, 0, "Line"},
+	{"BLOCKS",			4, MYSQL_TYPE_LONG,		0, 0, "Blocks"},
+	{"OBJECTS_IN_USE",	4, MYSQL_TYPE_LONG,		0, 0, "Objects in Use"},
+	{"SPACE_IN_USE",	4, MYSQL_TYPE_LONG,		0, 0, "Space in Use"},
+	{"OBJECTS_DELETED", 4, MYSQL_TYPE_LONG,		0, 0, "Objects Deleted"},
+	{"SPACE_DELETED",	4, MYSQL_TYPE_LONG,		0, 0, "Space Deleted"},
+	{0,					0, MYSQL_TYPE_STRING,	0, 0, 0}
+};
+
 int NfsPluginHandler::initRecordCacheDetail(void *p)
 {
 	DBUG_ENTER("initRecordCacheDetail");
 	ST_SCHEMA_TABLE *schema = (ST_SCHEMA_TABLE *)p;
-	schema->fields_info = memoryDetailFieldInfo;
+	schema->fields_info = recordDetailFieldInfo;
 	schema->fill_table = NfsPluginHandler::call_fillRecordCacheDetailTable;
 
 	DBUG_RETURN(0);
@@ -2363,11 +2377,22 @@
 	return infoTable.error;
 }
 
+ST_FIELD_INFO recordSummaryFieldInfo[]=
+{
+	{"TOTAL_SPACE",		4, MYSQL_TYPE_LONG,		0, 0, "Total Space"},
+	{"FREE_SPACE",		4, MYSQL_TYPE_LONG,		0, 0, "Free Space"},
+	{"FREE_SEGMENTS",	4, MYSQL_TYPE_LONG,		0, 0, "Free Segments"},
+	{"BIG_HUNKS",		4, MYSQL_TYPE_LONG,		0, 0, "Big Hunks"},
+	{"SMALL_HUNKS",		4, MYSQL_TYPE_LONG,		0, 0, "Small Hunks"},
+	{"UNIQUE_SIZES",	4, MYSQL_TYPE_LONG,		0, 0, "Unique Sizes"},
+	{0,					0, MYSQL_TYPE_STRING,	0, 0, 0}
+};
+
 int NfsPluginHandler::initRecordCacheSummary(void *p)
 {
 	DBUG_ENTER("initRecordCacheSummary");
 	ST_SCHEMA_TABLE *schema = (ST_SCHEMA_TABLE *)p;
-	schema->fields_info = memorySummaryFieldInfo;
+	schema->fields_info = recordSummaryFieldInfo;
 	schema->fill_table = NfsPluginHandler::call_fillRecordCacheSummaryTable;
 
 	DBUG_RETURN(0);