MySQL Lists are EOL. Please join:

List:Commits« Previous MessageNext Message »
From:Christopher Powers Date:August 20 2008 7:43pm
Subject:bzr push into mysql-6.0-falcon branch (cpowers:2790 to 2792) Bug#38041
View as plain text  
 2792 Christopher Powers	2008-08-20
      Bug #38041 "Bizarre errors when ALTER ADD/DROP KEY on Falcon tables"
      - Corrected mixup with StorageTableShare::syncObject and ::syncIndexes
      
      
      Bug #38377 "Options falcon_serial_log_dir does not have any effect"
      - Temporarily disabled fatal exception in Configuration::Configuration() until ScanDir.isDirectory() be fixed on Linux.
modified:
  storage/falcon/Configuration.cpp
  storage/falcon/StorageTableShare.cpp

 2791 Vladislav Vaintroub	2008-08-20
      Improve error handling in MemMgr::corrupt().
      Use FATAL macro instead of throwing BUG_CHECK. FATAL writes error text into 
      MySQL error log, uncaught exception can't do that.
modified:
  storage/falcon/MemMgr.cpp

 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

=== modified file 'storage/falcon/Configuration.cpp'
--- a/storage/falcon/Configuration.cpp	2008-08-19 14:27:42 +0000
+++ b/storage/falcon/Configuration.cpp	2008-08-20 19:40:10 +0000
@@ -158,7 +158,7 @@ Configuration::Configuration(const char 
 					"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);
+//			throw SQLEXCEPTION (FILE_ACCESS_ERROR, "Invalid serial log directory path \"%s\"", falcon_serial_log_dir);
 			}
 		}
 #else

=== modified file 'storage/falcon/MemMgr.cpp'
--- a/storage/falcon/MemMgr.cpp	2008-08-12 22:21:35 +0000
+++ b/storage/falcon/MemMgr.cpp	2008-08-20 16:28:44 +0000
@@ -694,7 +694,7 @@ void MemMgr::corrupt(const char* text)
 #endif
 
 	MemMgrLogDump();
-	throw SQLError (BUG_CHECK, "memory is corrupt: %s", text);
+	FATAL("memory is corrupt: %s", text);
 }
 
 void* MemMgr::memoryIsExhausted(void)

=== modified file 'storage/falcon/StorageTableShare.cpp'
--- a/storage/falcon/StorageTableShare.cpp	2008-08-19 03:33:01 +0000
+++ b/storage/falcon/StorageTableShare.cpp	2008-08-20 19:40:10 +0000
@@ -94,14 +94,12 @@ StorageTableShare::~StorageTableShare(vo
 
 void StorageTableShare::lock(bool exclusiveLock)
 {
-	//syncObject->lock(NULL, (exclusiveLock) ? Exclusive : Shared);
-	syncIndexes->lock(NULL, (exclusiveLock) ? Exclusive : Shared);
+	syncObject->lock(NULL, (exclusiveLock) ? Exclusive : Shared);
 }
 
 void StorageTableShare::unlock(void)
 {
-	//syncObject->unlock();
-	syncIndexes->unlock();
+	syncObject->unlock();
 }
 
 void StorageTableShare::lockIndexes(bool exclusiveLock)

Thread
bzr push into mysql-6.0-falcon branch (cpowers:2790 to 2792) Bug#38041Christopher Powers20 Aug