List:Internals« Previous MessageNext Message »
From:Martin Skold Date:March 31 2005 2:31pm
Subject:bk commit into 4.1 tree (mskold:1.2161)
View as plain text  
Below is the list of changes that have just been committed into a local
4.1 repository of marty. When marty 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.2161 05/03/31 14:31:06 mskold@stripped +1 -0
  Removed warnings

  ndb/src/kernel/blocks/dbdict/Dbdict.cpp
    1.30 05/03/31 14:30:13 mskold@stripped +3 -2
    Removed warnings

# 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:	mskold
# Host:	blowfish.ndb.mysql.com
# Root:	/usr/local/home/marty/MySQL/mysql-4.1

--- 1.29/ndb/src/kernel/blocks/dbdict/Dbdict.cpp	Fri Feb 25 09:10:32 2005
+++ 1.30/ndb/src/kernel/blocks/dbdict/Dbdict.cpp	Thu Mar 31 14:30:13 2005
@@ -2227,7 +2227,6 @@
 	  restartCreateTab(signal, tableId, oldEntry, false);
           return;
         }//if
-	ndbrequire(ok);
 	break;
       }
     }
@@ -2452,7 +2451,9 @@
   callback.m_callbackFunction = 
     safe_cast(&Dbdict::restartCreateTab_dihComplete);
   
-  SegmentedSectionPtr fragDataPtr; fragDataPtr.setNull();
+  SegmentedSectionPtr fragDataPtr; 
+  fragDataPtr.sz = 0;
+  fragDataPtr.setNull();
   createTab_dih(signal, createTabPtr, fragDataPtr, &callback);
 }
 
Thread
bk commit into 4.1 tree (mskold:1.2161)Martin Skold31 Mar