From: Date: April 29 2008 12:34pm
Subject: bk commit into 6.0 tree (svoj:1.2655) BUG#35190
List-Archive: http://lists.mysql.com/commits/46182
X-Bug: 35190
Message-Id: <20080429103418.D1D9641CECD@june.myoffice.izhnet.ru>

Below is the list of changes that have just been committed into a local
6.0 repository of svoj.  When svoj 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-29 15:34:12+05:00, svoj@stripped +1 -0
  BUG#35190 - Can't upgrade MySQL 6 without mysqldump first
  
  Falcon silently succeedes to open incompatible data files
  (e.g. created by different version) on server start.
  
  With this fix falcon refuses to start if it mets incompatible
  data files.

  storage/falcon/StorageHandler.cpp@stripped, 2008-04-29 15:34:09+05:00, svoj@stripped +1 -1
    When initializing falcon storage engine, return an error if we met
    incompatible data files.

diff -Nrup a/storage/falcon/StorageHandler.cpp b/storage/falcon/StorageHandler.cpp
--- a/storage/falcon/StorageHandler.cpp	2008-04-22 14:19:01 +05:00
+++ b/storage/falcon/StorageHandler.cpp	2008-04-29 15:34:09 +05:00
@@ -990,7 +990,7 @@ void StorageHandler::initialize(void)
 		
 		int err = e.getSqlcode();
 		
-		if (err == OUT_OF_MEMORY_ERROR || err == FILE_ACCESS_ERROR)
+		if (err == OUT_OF_MEMORY_ERROR || err == FILE_ACCESS_ERROR || err == VERSION_ERROR)
 			throw;
                
 		defaultDatabase->createDatabase();