Commit dcc08d2d authored by unknown's avatar unknown
Browse files

Merge perch.ndb.mysql.com:/home/jonas/src/51-work 

into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb


storage/ndb/include/mgmapi/mgmapi_config_parameters.h:
  Auto merged
storage/ndb/src/kernel/blocks/lgman.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupDiskAlloc.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupGen.cpp:
  Auto merged
storage/ndb/src/mgmsrv/ConfigInfo.cpp:
  Auto merged
parents 3ef5e410 1121ca8f

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

+2 −0
Original line number Diff line number Diff line
@@ -74,6 +74,8 @@ struct FreeExtentReq { 
      Local_key key;

      Uint32 table_id;

      Uint32 tablespace_id;

      Uint32 lsn_hi;

      Uint32 lsn_lo;

    } request;

    struct 

    {

storage/ndb/include/mgmapi/mgmapi_config_parameters.h

+2 −0
Original line number Diff line number Diff line
@@ -96,6 +96,8 @@ 
#define CFG_DB_CHECKPOINT_SPEED       164

#define CFG_DB_CHECKPOINT_SPEED_SR    165



#define CFG_DB_MEMREPORT_FREQUENCY    166



#define CFG_DB_SGA                    198 /* super pool mem */

#define CFG_DB_DATA_MEM_2             199 /* used in special build in 5.1 */

storage/ndb/src/kernel/blocks/dbacc/Dbacc.hpp

+1 −0
Original line number Diff line number Diff line
@@ -1100,6 +1100,7 @@ private: 
  };

  

  Uint32 c_errorInsert3000_TableId;

  Uint32 c_memusage_report_frequency;

};



#endif

storage/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp

+21 −7
Original line number Diff line number Diff line
@@ -112,6 +112,7 @@ void Dbacc::execCONTINUEB(Signal* signal) 
    }

  case ZREPORT_MEMORY_USAGE:{

    jam();

    Uint32 cnt = signal->theData[1];

    static int c_currentMemUsed = 0;

    int now = cpagesize ? (cnoOfAllocatedPages * 100)/cpagesize : 0;

    const int thresholds[] = { 99, 90, 80, 0};
@@ -125,14 +126,22 @@ void Dbacc::execCONTINUEB(Signal* signal) 
      }

    }

    

    if(now != c_currentMemUsed){

      reportMemoryUsage(signal, now > c_currentMemUsed ? 1 : -1);

    }

    

    if(now != c_currentMemUsed || 

       (c_memusage_report_frequency && cnt + 1 == c_memusage_report_frequency))

    {

      reportMemoryUsage(signal, 

			now > c_currentMemUsed ? 1 : 

			now < c_currentMemUsed ? -1 : 0);

      cnt = 0;

      c_currentMemUsed = now;

    

    }

    else

    {

      cnt ++;

    }

    signal->theData[0] = ZREPORT_MEMORY_USAGE;

    sendSignalWithDelay(reference(), GSN_CONTINUEB, signal, 2000, 1);    

    signal->theData[1] = cnt;

    sendSignalWithDelay(reference(), GSN_CONTINUEB, signal, 1000, 2);    

    return;

  }
@@ -199,7 +208,8 @@ void Dbacc::execNDB_STTOR(Signal* signal) 
    csystemRestart = ZFALSE;



    signal->theData[0] = ZREPORT_MEMORY_USAGE;

    sendSignalWithDelay(reference(), GSN_CONTINUEB, signal, 2000, 1);    

    signal->theData[1] = 0;

    sendSignalWithDelay(reference(), GSN_CONTINUEB, signal, 1000, 2);    

    break;

  default:

    jam();
@@ -353,6 +363,10 @@ void Dbacc::execREAD_CONFIG_REQ(Signal* signal) 
  initRecords();

  ndbrestart1Lab(signal);



  c_memusage_report_frequency = 0;

  ndb_mgm_get_int_parameter(p, CFG_DB_MEMREPORT_FREQUENCY, 

			    &c_memusage_report_frequency);

  

  tdata0 = 0;

  initialiseRecordsLab(signal, ref, senderData);

  return;

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

+5 −2
Original line number Diff line number Diff line
@@ -11276,7 +11276,7 @@ void Dblqh::execLCP_PREPARE_REF(Signal* signal) 
      /**

       * First fragment mean that last LCP is complete :-)

       */

      EXECUTE_DIRECT(TSMAN, GSN_END_LCP_REQ, signal, signal->length());

      EXECUTE_DIRECT(TSMAN, GSN_LCP_FRAG_ORD, signal, signal->length());

      jamEntry();

    }
@@ -11327,7 +11327,7 @@ void Dblqh::execLCP_PREPARE_CONF(Signal* signal) 
      /**

       * First fragment mean that last LCP is complete :-)

       */

      EXECUTE_DIRECT(TSMAN, GSN_END_LCP_REQ, signal, signal->length());

      EXECUTE_DIRECT(TSMAN, GSN_LCP_FRAG_ORD, signal, signal->length());

      jamEntry();

    }
@@ -11611,6 +11611,9 @@ void Dblqh::completeLcpRoundLab(Signal* signal, Uint32 lcpId) 
  sendSignal(LGMAN_REF, GSN_END_LCP_REQ, signal, 

	     EndLcpReq::SignalLength, JBB);

  

  EXECUTE_DIRECT(TSMAN, GSN_END_LCP_REQ, signal, EndLcpReq::SignalLength);

  jamEntry();

  

  lcpPtr.i = 0;

  ptrAss(lcpPtr, lcpRecord);

  lcpPtr.p->m_outstanding = 3;