Commit 33cd363d authored by unknown's avatar unknown
Browse files

Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new 

into  eel.(none):/home/jonas/src/mysql-5.1-new


storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
parents 7384eddb cd976d16

storage/ndb/include/kernel/signaldata/PgmanContinueB.hpp

+1 −1
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ private: 
    BUSY_LOOP = 1,

    CLEANUP_LOOP = 2,

    LCP_LOOP = 3,

    LCP_PREPARE = 4

    LCP_LOCKED = 4

  };

};

storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp

+0 −6
Original line number Diff line number Diff line
@@ -11203,12 +11203,6 @@ void Dblqh::sendLCP_FRAGIDREQ(Signal* signal) 
  sendSignal(BACKUP_REF, GSN_LCP_PREPARE_REQ, signal, 

	     LcpPrepareReq::SignalLength, JBB);









  if (lcpPtr.p->firstFragmentFlag)









  {









    lcpPtr.p->m_outstanding++;









    sendSignal(PGMAN_REF, GSN_LCP_PREPARE_REQ, signal, 









	       LcpPrepareReq::SignalLength, JBB);









  }









}//Dblqh::sendLCP_FRAGIDREQ()

















void Dblqh::sendEMPTY_LCP_CONF(Signal* signal, bool idle)
































storage/ndb/src/kernel/blocks/dblqh/Makefile.am



+5
−3






























Original line number
Diff line number
Diff line







@@ -6,9 +6,11 @@ ndbd_redo_log_reader_SOURCES = redoLogReader/records.cpp \







include $(top_srcdir)/storage/ndb/config/common.mk.am









include $(top_srcdir)/storage/ndb/config/type_kernel.mk.am



















LDADD +=  \









              $(top_builddir)/storage/ndb/src/common/util/libgeneral.la \









              $(top_builddir)/storage/ndb/src/common/portlib/libportlib.la









ndbd_redo_log_reader_LDFLAGS = @ndb_bin_am_ldflags@ \









  $(top_builddir)/storage/ndb/src/libndbclient.la \









         $(top_builddir)/dbug/libdbug.a \









         $(top_builddir)/mysys/libmysys.a \









         $(top_builddir)/strings/libmystrings.a



















# Don't update the files from bitkeeper









%::SCCS/s.%
























storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp



+4
−1






























Original line number
Diff line number
Diff line







@@ -604,6 +604,7 @@ struct Fragrecord {







  SLList<Page>::Head m_empty_pages; // Empty pages not in logical/physical map









  









  Uint32 m_lcp_scan_op;









  Uint32 m_lcp_keep_list;



















  State fragStatus;









  Uint32 fragTableId;








@@ -1194,8 +1195,10 @@ typedef Ptr<HostBuffer> HostBufferPtr;







    STATIC_CONST( ALLOC       = 0x00100000 ); // Is record allocated now









    STATIC_CONST( MM_SHRINK   = 0x00200000 ); // Has MM part shrunk









    STATIC_CONST( MM_GROWN    = 0x00400000 ); // Has MM part grown









    STATIC_CONST( FREE        = 0x00800000 ); // On free list of page









    STATIC_CONST( FREED       = 0x00800000 ); // Is freed









    STATIC_CONST( LCP_SKIP    = 0x01000000 ); // Should not be returned in LCP









    STATIC_CONST( LCP_KEEP    = 0x02000000 ); // Should be returned in LCP









    STATIC_CONST( FREE        = 0x02800000 ); // Is free









    









    Uint32 get_tuple_version() const { 









      return m_header_bits & TUP_VERSION_MASK;
































storage/ndb/src/kernel/blocks/dbtup/DbtupAbort.cpp



+1
−1






























Original line number
Diff line number
Diff line







@@ -172,7 +172,7 @@ void Dbtup::execTUP_ABORTREQ(Signal* signal)







       */









      ndbout_c("clearing ALLOC");









      tuple_ptr->m_header_bits &= ~(Uint32)Tuple_header::ALLOC;









      tuple_ptr->m_header_bits |= Tuple_header::FREE;









      tuple_ptr->m_header_bits |= Tuple_header::FREED;









    }









  }