bk commit into 5.1 tree (jonas:1.1974)

[jonas]

Below is the list of changes that have just been committed into a local
5.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.1974 05/08/26 13:54:01 jonas@eel.(none) +3 -0
  ndb diskdata -
    remove debug printouts from last commit

  storage/ndb/src/kernel/blocks/tsman.cpp
    1.44 05/08/26 13:53:56 jonas@eel.(none) +0 -6
    remove debug printouts from last commit

  storage/ndb/src/kernel/blocks/lgman.cpp
    1.52 05/08/26 13:53:56 jonas@eel.(none) +0 -9
    remove debug printouts from last commit

  storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp
    1.92 05/08/26 13:53:56 jonas@eel.(none) +3 -12
    remove debug printouts from last commit

# 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:	jonas
# Host:	eel.(none)
# Root:	/home/jonas/src/mysql-5.1-ndb-dd

--- 1.51/storage/ndb/src/kernel/blocks/lgman.cpp	2005-08-26 13:26:48 +02:00
+++ 1.52/storage/ndb/src/kernel/blocks/lgman.cpp	2005-08-26 13:53:56 +02:00
@@ -320,8 +320,6 @@
     switch(requestInfo){
     case CreateFileImplReq::Commit:
     {
-      ndbout_c("Create undofile %d commit", req->file_id);
-
       ndbrequire(find_file_by_id(file_ptr, ptr.p->m_meta_files, req->file_id));
       file_ptr.p->m_create.m_senderRef = req->senderRef;
       file_ptr.p->m_create.m_senderData = req->senderData;
@@ -330,19 +328,16 @@
     }
     case CreateFileImplReq::Abort:
     {
-      ndbout_c("Create undofile %d abort", req->file_id);
       Uint32 senderRef = req->senderRef;
       Uint32 senderData = req->senderData;
       if (find_file_by_id(file_ptr, ptr.p->m_meta_files, req->file_id))
       {
-	ndbout_c("Create undofile %d abort", req->file_id);
 	file_ptr.p->m_create.m_senderRef = senderRef;
 	file_ptr.p->m_create.m_senderData = senderData;
 	create_file_abort(signal, ptr, file_ptr);
       }
       else
       {
-	ndbout_c("Create undofile %d nofile", req->file_id);	
 	CreateFileImplConf* conf= (CreateFileImplConf*)signal->getDataPtr();
 	conf->senderData = senderData;
 	conf->senderRef = reference();
@@ -355,7 +350,6 @@
     default: // prepare
       break;
     }
-    ndbout_c("Create undofile %d prepare", req->file_id);
     
     if (!m_file_pool.seize(file_ptr))
     {
@@ -615,7 +609,6 @@
     return;
   }
 
-  ndbout_c("removing file");
   FsCloseReq *req= (FsCloseReq*)signal->getDataPtrSend();
   req->filePointer = ptr.p->m_fd;
   req->userReference = reference();
@@ -643,8 +636,6 @@
   LocalDLFifoList<Undofile> list(m_file_pool, lg_ptr.p->m_meta_files);
   list.remove(ptr);
   
-  ndbout_c("releaseing file");
-
   CreateFileImplConf* conf= (CreateFileImplConf*)signal->getDataPtr();
   conf->senderData = senderData;
   conf->senderRef = reference();

--- 1.43/storage/ndb/src/kernel/blocks/tsman.cpp	2005-08-26 13:26:48 +02:00
+++ 1.44/storage/ndb/src/kernel/blocks/tsman.cpp	2005-08-26 13:53:56 +02:00
@@ -342,7 +342,6 @@
     switch(req->requestInfo){
     case CreateFileImplReq::Commit:
     {
-      ndbout_c("Create file commit");
       ndbrequire(find_file_by_id(file_ptr, ptr.p->m_meta_files, req->file_id));
       file_ptr.p->m_create.m_senderRef = req->senderRef;
       file_ptr.p->m_create.m_senderData = req->senderData;
@@ -359,7 +358,6 @@
       Uint32 senderData = req->senderData;
       if(find_file_by_id(file_ptr, ptr.p->m_meta_files, req->file_id))
       {
-	ndbout_c("Create file abort");
 	file_ptr.p->m_create.m_senderRef = senderRef;
 	file_ptr.p->m_create.m_senderData = senderData;
 	file_ptr.p->m_create.m_requestInfo = req->requestInfo;
@@ -368,7 +366,6 @@
       }
       else
       {
-	ndbout_c("Create file abort nofile");
 	CreateFileImplConf* conf= (CreateFileImplConf*)signal->getDataPtr();
 	conf->senderData = senderData;
 	conf->senderRef = reference();
@@ -378,7 +375,6 @@
       }
     }
     default:
-      ndbout_c("Create file prepare");
       // Prepare
       break;
     }
@@ -422,7 +418,6 @@
     return;
   }
 
-  ndbout_c("removing file");
   FsCloseReq *req= (FsCloseReq*)signal->getDataPtrSend();
   req->filePointer = ptr.p->m_fd;
   req->userReference = reference();
@@ -452,7 +447,6 @@
     LocalDLList<Datafile> list(m_file_pool, lg_ptr.p->m_meta_files);
     list.remove(ptr);
   }
-  ndbout_c("releaseing file");
   
   CreateFileImplConf* conf= (CreateFileImplConf*)signal->getDataPtr();
   conf->senderData = senderData;

--- 1.91/storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp	2005-08-26 13:26:48 +02:00
+++ 1.92/storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp	2005-08-26 13:53:56 +02:00
@@ -12886,7 +12886,6 @@
       
       create_obj->objId = objId;
       trans_ptr.p->m_op.m_obj_id = objId;
-      ndbout_c("execCREATE_FILE_REQ objId = %d", objId);
       create_obj->gci = 0;
       
       XSchemaFile * xsf = &c_schemaFile[c_schemaRecord.schemaPage != 0];
@@ -12986,7 +12985,6 @@
       
       create_obj->objId = objId;
       trans_ptr.p->m_op.m_obj_id = objId;
-      ndbout_c("execCREATE_FILEGROUP_REQ objId = %d", objId);
       create_obj->gci = 0;
       
       XSchemaFile * xsf = &c_schemaFile[c_schemaRecord.schemaPage != 0];
@@ -13269,8 +13267,8 @@
     ref->status = 0;
     
     //@todo check api failed
-    sendSignal(trans_ptr.p->m_senderRef, GSN_CREATE_FILE_CONF, signal, 
-	       CreateFilegroupConf::SignalLength, JBB);
+    sendSignal(trans_ptr.p->m_senderRef, GSN_CREATE_FILE_REF, signal, 
+	       CreateFileRef::SignalLength, JBB);
     
     break;
   }
@@ -13297,15 +13295,12 @@
   DictObjOp::RequestType rt = (DictObjOp::RequestType)req->requestType;
   switch(rt){
   case DictObjOp::Prepare:
-    ndbout_c("execCREATE_OBJ_REQ PREPARE");
     createObj_prepare(signal, req);
     return;
   case DictObjOp::Commit:
-    ndbout_c("execCREATE_OBJ_REQ COMMIT");
     createObj_commit(signal, req);
     return;
   case DictObjOp::Abort:
-    ndbout_c("execCREATE_OBJ_REQ ABORT");
     createObj_abort(signal, req);
     return;
   }
@@ -13784,9 +13779,7 @@
     default:
       ndbrequire(false);
     }
-    
-    ndbout_c("Storing fg: %s", fg.FilegroupName);
-    
+
     obj_ptr.p->m_id = op->m_obj_id;
     obj_ptr.p->m_type = fg.FilegroupType;
     c_obj_hash.add(obj_ptr);
@@ -13977,8 +13970,6 @@
     filePtr.p->m_obj_ptr_i = obj_ptr.i;
     filePtr.p->m_filegroup_id = f.FilegroupId;
     filePtr.p->m_type = f.FileType;
-    
-    ndbout_c("Storing file: %s", f.FileName);
     
     obj_ptr.p->m_id = op->m_obj_id;
     obj_ptr.p->m_type = f.FileType;