From: Date: April 22 2005 11:04am
Subject: bk commit into 4.1 tree (joreland:1.2182) BUG#9724
List-Archive: http://lists.mysql.com/internals/24219
X-Bug: 9724
Message-Id: <20050422090435.393C9F5243@eel.hemma.oreland.se.ndb.mysql.com>

Below is the list of changes that have just been committed into a local
4.1 repository of jonas. When jonas 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
  1.2182 05/04/22 11:04:26 joreland@stripped +1 -0
  bug#9724 - ndb restart
    if file already open occur print files...

  ndb/src/kernel/blocks/ndbfs/OpenFiles.hpp
    1.2 05/04/22 11:04:21 joreland@stripped +8 -2
    bug#9724 - ndb restart
      if file already open occur print files...

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	joreland
# Host:	eel.hemma.oreland.se.ndb.mysql.com
# Root:	/home/jonas/src/mysql-4.1

--- 1.1/ndb/src/kernel/blocks/ndbfs/OpenFiles.hpp	Wed Apr 14 10:24:21 2004
+++ 1.2/ndb/src/kernel/blocks/ndbfs/OpenFiles.hpp	Fri Apr 22 11:04:21 2005
@@ -82,8 +82,14 @@
       continue;
 
     if(strcmp(m_files[i].m_file->theFileName.c_str(), 
-	      file->theFileName.c_str()) == 0){
-      ERROR_SET(fatal, AFS_ERROR_ALLREADY_OPEN,"","OpenFiles::insert()");    
+	      file->theFileName.c_str()) == 0)
+    {
+      BaseString names;
+      names.assfmt("open: >%s< existing: >%s<",
+		   file->theFileName.c_str(),
+		   m_files[i].m_file->theFileName.c_str());
+      ERROR_SET(fatal, AFS_ERROR_ALLREADY_OPEN, names.c_str(),
+		"OpenFiles::insert()");    
     }
   }