From: Date: August 19 2008 4:28pm
Subject: bzr push into mysql-6.0-falcon branch (lars-erik.bjork:2789 to 2790)
 Bug#38377
List-Archive: http://lists.mysql.com/commits/51965
X-Bug: 38377
Message-Id: <200808191428.m7JESlZB009176@dm-norway-02.uk.sun.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 2790 lars-erik.bjork@stripped	2008-08-19
      A fix for bug#38377 - Options falcon_serial_log_dir does not have any effect
modified:
  storage/falcon/Configuration.cpp
  storage/falcon/ha_falcon.cpp

 2789 Vladislav Vaintroub	2008-08-19 [merge]
      merge
modified:
  storage/falcon/Index.cpp
  storage/falcon/Index.h
  storage/falcon/StorageTable.cpp
  storage/falcon/StorageTableShare.cpp

=== modified file 'storage/falcon/Configuration.cpp'
--- a/storage/falcon/Configuration.cpp	2008-07-17 13:52:17 +0000
+++ b/storage/falcon/Configuration.cpp	2008-08-19 14:27:42 +0000
@@ -151,8 +151,14 @@ Configuration::Configuration(const char 
 		
 		if (!scanDir.isDirectory())
 			{
-			//throw SQLEXCEPTION (RUNTIME_ERROR, "Invalid serial log directory path \"%s\"", falcon_serial_log_dir);
-			serialLogDir = "";
+			fprintf(stderr, 
+					"Falcon: The specified serial log directory, \"%s\", "
+					"does not exist.\n"
+					"Falcon: The serial log directory must be created by "
+					"the user before initializing Falcon.\n", 
+					falcon_serial_log_dir
+				);
+			throw SQLEXCEPTION (FILE_ACCESS_ERROR, "Invalid serial log directory path \"%s\"", falcon_serial_log_dir);
 			}
 		}
 #else

=== modified file 'storage/falcon/ha_falcon.cpp'
--- a/storage/falcon/ha_falcon.cpp	2008-08-18 05:45:29 +0000
+++ b/storage/falcon/ha_falcon.cpp	2008-08-19 14:27:42 +0000
@@ -216,13 +216,13 @@ int StorageInterface::falcon_init(void *
 		}
 	catch(SQLException &e)
 		{
-		sql_print_error("Falcon : exception '%s'during initialization",
+		sql_print_error("Falcon: Exception '%s' during initialization",
 			e.getText());
 		error = true;
 		}
 	catch(...)
 		{
-		sql_print_error(" Falcon : general exception in initialization");
+		sql_print_error(" Falcon: General exception in initialization");
 		error = true;
 		}