bk commit into 6.0 tree (klewis:1.2645)

[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-04-25 00:54:58-05:00, klewis@klewis-mysql. +2 -0
  Eliminate recent compiler warnings

  storage/falcon/StorageDatabase.cpp@stripped, 2008-04-25 00:54:45-05:00, klewis@klewis-mysql. +1 -1
    Eliminate recent compiler warnings

  storage/falcon/ha_falcon.cpp@stripped, 2008-04-25 00:54:48-05:00, klewis@klewis-mysql. +4 -4
    Eliminate recent compiler warnings

diff -Nrup a/storage/falcon/StorageDatabase.cpp b/storage/falcon/StorageDatabase.cpp
--- a/storage/falcon/StorageDatabase.cpp	2008-04-24 09:07:52 -05:00
+++ b/storage/falcon/StorageDatabase.cpp	2008-04-25 00:54:45 -05:00
@@ -228,7 +228,7 @@ Table* StorageDatabase::upgradeTable(Sto
 	
 	try
 		{
-		Table *table = database->findTable(schemaName, tableName);
+		//Table *table = database->findTable(schemaName, tableName);
 		statement->execute(sql);
 		
 		if (autoIncrementValue)
diff -Nrup a/storage/falcon/ha_falcon.cpp b/storage/falcon/ha_falcon.cpp
--- a/storage/falcon/ha_falcon.cpp	2008-04-23 09:39:48 -05:00
+++ b/storage/falcon/ha_falcon.cpp	2008-04-25 00:54:48 -05:00
@@ -2061,7 +2061,7 @@ int StorageInterface::alter_tablespace(h
 int StorageInterface::check_if_supported_alter(TABLE *altered_table, HA_CREATE_INFO *create_info, HA_ALTER_FLAGS *alter_flags, uint table_changes)
 {
 	DBUG_ENTER("StorageInterface::check_if_supported_alter");
-	ulonglong bits = alter_flags->to_ulonglong();
+	// ulonglong bits = alter_flags->to_ulonglong();
 	tempTable = (create_info->options & HA_LEX_CREATE_TMP_TABLE) ? true : false;
 	
 	if (!tempTable && alter_flags->is_set(HA_ADD_COLUMN))
@@ -2085,18 +2085,18 @@ int StorageInterface::check_if_supported
 		DBUG_RETURN(HA_ALTER_SUPPORTED_NO_LOCK);
 		}
 		
-   DBUG_RETURN(HA_ALTER_NOT_SUPPORTED);
+	DBUG_RETURN(HA_ALTER_NOT_SUPPORTED);
 }
 
 int StorageInterface::alter_table_phase1(THD* thd, TABLE* altered_table, HA_CREATE_INFO* create_info, HA_ALTER_INFO* alter_info, HA_ALTER_FLAGS* alter_flags)
 {
 	DBUG_ENTER("StorageInterface::alter_table_phase1");
- 	ulonglong bits = alter_flags->to_ulonglong();
+	// ulonglong bits = alter_flags->to_ulonglong();
 	
 	if (alter_flags->is_set(HA_ADD_COLUMN))
 		DBUG_RETURN(addColumn(thd, altered_table, create_info, alter_info, alter_flags));
 		
-   DBUG_RETURN(HA_ERR_UNSUPPORTED);
+	DBUG_RETURN(HA_ERR_UNSUPPORTED);
 }
 
 int StorageInterface::alter_table_phase2(THD* thd, TABLE* altered_table, HA_CREATE_INFO* create_info, HA_ALTER_INFO* alter_info, HA_ALTER_FLAGS* alter_flags)