List:Commits« Previous MessageNext Message »
From:jonas Date:May 20 2006 2:54pm
Subject:bk commit into 5.1 tree (ndbdev:1.2373)
View as plain text  
Below is the list of changes that have just been committed into a local
5.1 repository of ndbdev. When ndbdev 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.2373 06/05/20 16:54:29 ndbdev@stripped +1 -0
  gcc4 compile fix

  storage/ndb/src/kernel/blocks/dblqh/Dblqh.hpp
    1.47 06/05/20 16:54:16 ndbdev@stripped +4 -1
    gcc4 compile fix

# 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:	ndbdev
# Host:	ndbmaster.mysql.com
# Root:	/ndb/clone-mysql-5.1-jonas-2006-05-20

--- 1.46/storage/ndb/src/kernel/blocks/dblqh/Dblqh.hpp	Thu May 18 10:17:50 2006
+++ 1.47/storage/ndb/src/kernel/blocks/dblqh/Dblqh.hpp	Sat May 20 16:54:16 2006
@@ -33,6 +33,9 @@
 // primary key is stored in TUP
 #include "../dbtup/Dbtup.hpp"
 
+class Dbacc;
+class Dbtup;
+
 #ifdef DBLQH_C
 // Constants
 /* ------------------------------------------------------------------------- */
@@ -2934,8 +2937,8 @@
 
   DLHashTable<ScanRecord> c_scanTakeOverHash;
 
-#ifdef ERROR_INSERT
   inline bool TRACE_OP_CHECK(const TcConnectionrec* regTcPtr);
+#ifdef ERROR_INSERT
   void TRACE_OP_DUMP(const TcConnectionrec* regTcPtr, const char * pos);
 #endif
 };
Thread
bk commit into 5.1 tree (ndbdev:1.2373)jonas20 May