bk commit into 6.0 tree (klewis:1.2605) BUG#35490

[klewis]

Below is the list of changes that have just been committed into a local
6.0 repository of klewis.  When klewis 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-03-21 15:42:16-05:00, klewis@klewis-mysql. +2 -0
  Bug#35490 - Rename falcon_database_io to falcon_tablespace_io

  storage/falcon/ha_falcon.cpp@stripped, 2008-03-21 15:42:01-05:00, klewis@klewis-mysql. +12
-12
    Bug#35490 - Rename falcon_database_io to falcon_tablespace_io

  storage/falcon/ha_falcon.h@stripped, 2008-03-21 15:42:07-05:00, klewis@klewis-mysql. +3 -3
    Bug#35490 - Rename falcon_database_io to falcon_tablespace_io

diff -Nrup a/storage/falcon/ha_falcon.cpp b/storage/falcon/ha_falcon.cpp
--- a/storage/falcon/ha_falcon.cpp	2008-03-12 07:15:13 -05:00
+++ b/storage/falcon/ha_falcon.cpp	2008-03-21 15:42:01 -05:00
@@ -2771,7 +2771,7 @@ int NfsPluginHandler::deinitRecordCacheS
 //
 //*****************************************************************************
 
-int NfsPluginHandler::call_fillDatabaseIOTable(THD *thd, TABLE_LIST *tables, COND *cond)
+int NfsPluginHandler::call_fillTablespaceIOTable(THD *thd, TABLE_LIST *tables, COND
*cond)
 {
 	InfoTableImpl infoTable(thd, tables, system_charset_info);
 
@@ -2793,19 +2793,19 @@ ST_FIELD_INFO databaseIOFieldInfo[]=
 	{0,					0, MYSQL_TYPE_STRING,	0, 0, 0, SKIP_OPEN_TABLE}
 };
 
-int NfsPluginHandler::initDatabaseIO(void *p)
+int NfsPluginHandler::initTablespaceIO(void *p)
 {
-	DBUG_ENTER("initDatabaseIO");
+	DBUG_ENTER("initTablespaceIO");
 	ST_SCHEMA_TABLE *schema = (ST_SCHEMA_TABLE *)p;
 	schema->fields_info = databaseIOFieldInfo;
-	schema->fill_table = NfsPluginHandler::call_fillDatabaseIOTable;
+	schema->fill_table = NfsPluginHandler::call_fillTablespaceIOTable;
 
 	DBUG_RETURN(0);
 }
 
-int NfsPluginHandler::deinitDatabaseIO(void *p)
+int NfsPluginHandler::deinitTablespaceIO(void *p)
 {
-	DBUG_ENTER("deinitDatabaseIO");
+	DBUG_ENTER("deinitTablespaceIO");
 	DBUG_RETURN(0);
 }
 
@@ -3219,7 +3219,7 @@ static st_mysql_information_schema falco
 static st_mysql_information_schema falcon_system_memory_summary =	{
MYSQL_INFORMATION_SCHEMA_INTERFACE_VERSION};
 static st_mysql_information_schema falcon_record_cache_detail	=	{
MYSQL_INFORMATION_SCHEMA_INTERFACE_VERSION};
 static st_mysql_information_schema falcon_record_cache_summary	=	{
MYSQL_INFORMATION_SCHEMA_INTERFACE_VERSION};
-static st_mysql_information_schema falcon_database_io			=	{
MYSQL_INFORMATION_SCHEMA_INTERFACE_VERSION};
+static st_mysql_information_schema falcon_tablespace_io			=	{
MYSQL_INFORMATION_SCHEMA_INTERFACE_VERSION};
 static st_mysql_information_schema falcon_transaction_info		=	{
MYSQL_INFORMATION_SCHEMA_INTERFACE_VERSION};
 static st_mysql_information_schema falcon_transaction_summary_info=	{
MYSQL_INFORMATION_SCHEMA_INTERFACE_VERSION};
 static st_mysql_information_schema falcon_sync_info				=	{
MYSQL_INFORMATION_SCHEMA_INTERFACE_VERSION};
@@ -3365,13 +3365,13 @@ mysql_declare_plugin(falcon)
 
 	{
 	MYSQL_INFORMATION_SCHEMA_PLUGIN,
-	&falcon_database_io,
-	"FALCON_DATABASE_IO",
+	&falcon_tablespace_io,
+	"FALCON_TABLESPACE_IO",
 	"MySQL AB",
-	"Falcon Database IO.",
+	"Falcon Tablespace IO.",
 	PLUGIN_LICENSE_GPL,
-	NfsPluginHandler::initDatabaseIO,			/* plugin init */
-	NfsPluginHandler::deinitDatabaseIO,			/* plugin deinit */
+	NfsPluginHandler::initTablespaceIO,			/* plugin init */
+	NfsPluginHandler::deinitTablespaceIO,			/* plugin deinit */
 	0x0005,
 	NULL,										/* status variables */
 	NULL,										/* system variables */
diff -Nrup a/storage/falcon/ha_falcon.h b/storage/falcon/ha_falcon.h
--- a/storage/falcon/ha_falcon.h	2008-03-11 10:16:31 -05:00
+++ b/storage/falcon/ha_falcon.h	2008-03-21 15:42:07 -05:00
@@ -205,9 +205,9 @@ public:
 	static int initRecordCacheSummary(void *p);
 	static int deinitRecordCacheSummary(void *p);
 
-	static int call_fillDatabaseIOTable(THD *thd, TABLE_LIST *tables, COND *cond);
-	static int initDatabaseIO(void *p);
-	static int deinitDatabaseIO(void *p);
+	static int call_fillTablespaceIOTable(THD *thd, TABLE_LIST *tables, COND *cond);
+	static int initTablespaceIO(void *p);
+	static int deinitTablespaceIO(void *p);
 
 	static int callTransactionInfo(THD *thd, TABLE_LIST *tables, COND *cond);
 	static int initTransactionInfo(void *p);