bzr commit into mysql-6.0-falcon-team branch (hky:3090)

[Hakan Kuecuekyilmaz]

#At file:///home/hakan/work/mysql/mysql-6.0-falcon-team-to-merge/ based on revid:hky@stripped90331175254-ovskr5w7b4ccgqiw

 3090 Hakan Kuecuekyilmaz	2009-03-31 [merge]
      Automerge.

    modified:
      storage/falcon/CmdGen.cpp
      storage/falcon/Configuration.cpp
      storage/falcon/StorageHandler.cpp
      storage/falcon/StorageTable.cpp
      storage/falcon/ha_falcon.cpp
=== modified file 'storage/falcon/CmdGen.cpp'
--- a/storage/falcon/CmdGen.cpp	2008-04-09 01:36:46 +0000
+++ b/storage/falcon/CmdGen.cpp	2009-03-31 18:19:17 +0000
@@ -108,7 +108,7 @@ const char* CmdGen::getString(void)
 		return buffer;
 		}
 	
-	delete temp;
+	delete [] temp;
 	temp = new char[totalLength + 1];
 	memcpy(temp, buffer, sizeof(buffer));
 	char *p = temp + sizeof(buffer);
@@ -139,6 +139,6 @@ void CmdGen::reset(void)
 		delete hunk;
 		}
 
-	delete temp;
+	delete [] temp;
 	init();
 }

=== modified file 'storage/falcon/Configuration.cpp'
--- a/storage/falcon/Configuration.cpp	2008-11-20 17:05:50 +0000
+++ b/storage/falcon/Configuration.cpp	2009-03-31 18:19:17 +0000
@@ -108,7 +108,7 @@ Configuration::Configuration(const char 
 	checkpointSchedule = "7,37 * * * * *";
 	scavengeSchedule = "15,45 * * * * *";
 	serialLogBlockSize			= falcon_serial_log_block_size;
-	maxTransactionBacklog		        = MAX_TRANSACTION_BACKLOG;
+	maxTransactionBacklog		= MAX_TRANSACTION_BACKLOG;
 
 #ifdef STORAGE_ENGINE
 	recordMemoryMax				= falcon_record_memory_max;

=== modified file 'storage/falcon/StorageHandler.cpp'
--- a/storage/falcon/StorageHandler.cpp	2009-01-27 17:26:16 +0000
+++ b/storage/falcon/StorageHandler.cpp	2009-03-31 18:19:17 +0000
@@ -143,12 +143,6 @@ StorageHandler::StorageHandler(int lockS
 
 StorageHandler::~StorageHandler(void)
 {
-	for (int n = 0; n < databaseHashSize; ++n)
-		for (StorageDatabase *storageDatabase; (storageDatabase = storageDatabases[n]);)
-			{
-			storageDatabases[n] = storageDatabase->collision;
-			delete storageDatabase;
-			}
 
 	for (int n = 0; n < tableHashSize; ++n)
 		for (StorageTableShare *table; (table = tables[n]);)
@@ -156,6 +150,14 @@ StorageHandler::~StorageHandler(void)
 			tables[n] = table->collision;
 			delete table;
 			}
+
+	for (int n = 0; n < databaseHashSize; ++n)
+		for (StorageDatabase *storageDatabase; (storageDatabase = storageDatabases[n]);)
+			{
+			storageDatabases[n] = storageDatabase->collision;
+			delete storageDatabase;
+			}
+
 }
 
 void StorageHandler::startNfsServer(void)

=== modified file 'storage/falcon/StorageTable.cpp'
--- a/storage/falcon/StorageTable.cpp	2009-03-28 18:10:17 +0000
+++ b/storage/falcon/StorageTable.cpp	2009-03-31 18:19:17 +0000
@@ -1,4 +1,4 @@
-/* Copyright � 2006-2008 MySQL AB, 2008-2009 Sun Microsystems, Inc.
+/* Copyright (c) 2006-2008 MySQL AB, 2008-2009 Sun Microsystems, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'storage/falcon/ha_falcon.cpp'
--- a/storage/falcon/ha_falcon.cpp	2009-03-26 12:36:59 +0000
+++ b/storage/falcon/ha_falcon.cpp	2009-03-31 18:19:17 +0000
@@ -288,6 +288,8 @@ int StorageInterface::falcon_deinit(void
 {
 	if(storageHandler)
 		{
+		storageHandler->deleteNfsLogger(StorageInterface::mysqlLogger, NULL);
+		storageHandler->deleteNfsLogger(StorageInterface::logger, NULL);
 		storageHandler->shutdownHandler();
 		freeFalconStorageHandler();
 		}

Attachment: [text/bzr-bundle] bzr/[e-mail]