From: Date: November 6 2008 1:46pm
Subject: bzr commit into mysql-6.0-falcon-team branch (svoj:2905) Bug#36804
List-Archive: http://lists.mysql.com/commits/58010
X-Bug: 36804
Message-Id: <20081106124629.3B89041CED0@june.myoffice.izhnet.ru>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Transfer-Encoding: 7BIT

#At file:///home/svoj/devel/bzr-mysql/mysql-6.0-falcon-team-bug36804/

 2905 Sergey Vojtovich	2008-11-06
      BUG#36804 - Falcon does not detect deleted tablespace files
      
      Falcon silently recreates it's system data files if it wasn't
      able to open them. With this fix Falcon provides some
      additional information in error log.
      
      When starting mysql server with Falcon and we were unable
      to open Falcon system data files, write a warning to error
      log.
      
      Write an error message to error log when attempting to access
      a table that doesn't exist in Falcon.
modified:
  storage/falcon/StorageHandler.cpp
  storage/falcon/ha_falcon.cpp

per-file messages:
  storage/falcon/StorageHandler.cpp
    When starting mysql server with Falcon and we were unable
    to open Falcon system data files, write a warning to error
    log.
  storage/falcon/ha_falcon.cpp
    Write an error message to error log when attempting to access
    a table that doesn't exist in Falcon.
=== modified file 'storage/falcon/StorageHandler.cpp'
--- a/storage/falcon/StorageHandler.cpp	2008-10-31 10:13:58 +0000
+++ b/storage/falcon/StorageHandler.cpp	2008-11-06 12:46:08 +0000
@@ -998,6 +998,8 @@ void StorageHandler::initialize(void)
 
 		try
 			{
+			fprintf(stderr, "Falcon: unable to open system data files.\n");
+			fprintf(stderr, "Falcon: creating new system data files.\n");
 			createDatabase();
 			}
 		catch(SQLException &e2)

=== modified file 'storage/falcon/ha_falcon.cpp'
--- a/storage/falcon/ha_falcon.cpp	2008-11-05 14:51:37 +0000
+++ b/storage/falcon/ha_falcon.cpp	2008-11-06 12:46:08 +0000
@@ -536,6 +536,10 @@ int StorageInterface::open(const char *n
 
 	int ret = storageTable->open();
 
+	if (ret == StorageErrorTableNotFound)
+		sql_print_error("Server is attempting to access a table %s,\n"
+				"which doesn't exist in Falcon.", name);
+
 	if (ret)
 		DBUG_RETURN(error(ret));
 
@@ -1025,6 +1029,10 @@ int StorageInterface::delete_table(const
 	storageTable->deleteStorageTable();
 	storageTable = NULL;
 
+	if (res == StorageErrorTableNotFound)
+		sql_print_error("Server is attempting to drop a table %s,\n"
+				"which doesn't exist in Falcon.", tableName);
+
 	// (hk) Fix for Bug#31465 Running Falcon test suite leads
 	//                        to warnings about temp tables
 	// This fix could affect other DROP TABLE scenarios.