Commit e4903c29 authored by unknown's avatar unknown
Browse files

Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-maint 

into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb


storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
parents fd2996ad 04c8e7e4

mysql-test/ndb/ndbcluster.sh

+1 −1
Original line number Diff line number Diff line
@@ -35,8 +35,8 @@ if [ -d ../sql ] ; then 
   exec_mgmtsrvr=$ndbtop/src/mgmsrv/ndb_mgmd

   exec_waiter=$ndbtop/tools/ndb_waiter

   exec_test=$ndbtop/tools/ndb_test_platform

   exec_test_ndberror=

   exec_test_ndberror=$ndbtop/src/ndbapi/ndberror_check

   exec_mgmtclient=$ndbtop/src/mgmclient/ndb_mgm

else

   BINARY_DIST=1

   if test -x "$BASEDIR/libexec/ndbd"

sql/ha_ndbcluster.cc

+5 −4
Original line number Diff line number Diff line
@@ -1008,7 +1008,7 @@ int ha_ndbcluster::get_metadata(const char *path) 
  DBUG_ASSERT(m_table == NULL);

  DBUG_ASSERT(m_table_info == NULL);



  const void *data, *pack_data;

  const void *data= NULL, *pack_data= NULL;

  uint length, pack_length;



  /*
@@ -4732,7 +4732,7 @@ int ha_ndbcluster::create(const char *name, 
  NDBTAB tab;

  NDBCOL col;

  uint pack_length, length, i, pk_length= 0;

  const void *data, *pack_data;

  const void *data= NULL, *pack_data= NULL;

  bool create_from_engine= (create_info->table_options & HA_OPTION_CREATE_FROM_ENGINE);

  bool is_truncate= (thd->lex->sql_command == SQLCOM_TRUNCATE);

  char tablespace[FN_LEN];
@@ -5065,7 +5065,7 @@ int ha_ndbcluster::create_handler_files(const char *file, 
{ 

  Ndb* ndb;

  const NDBTAB *tab;

  const void *data, *pack_data;

  const void *data= NULL, *pack_data= NULL;

  uint length, pack_length;

  int error= 0;
@@ -6108,7 +6108,7 @@ int ndbcluster_discover(handlerton *hton, THD* thd, const char *db, 
  int error= 0;

  NdbError ndb_error;

  uint len;

  const void* data;

  const void* data= NULL;

  Ndb* ndb;

  char key[FN_REFLEN];

  DBUG_ENTER("ndbcluster_discover");
@@ -6187,6 +6187,7 @@ int ndbcluster_discover(handlerton *hton, THD* thd, const char *db, 


  DBUG_RETURN(0);

err:

  my_free((char*)data, MYF(MY_ALLOW_ZERO_PTR));

  if (share)

  {

    /* ndb_share reference temporary free */

storage/ndb/src/common/debugger/EventLogger.cpp

+2 −2
Original line number Diff line number Diff line
@@ -744,9 +744,9 @@ void getTextEventBufferStatus(QQQQ) { 
		       "Event buffer status: used=%d%s(%d%) alloc=%d%s(%d%) "

		       "max=%d%s apply_gci=%lld latest_gci=%lld",

		       used, used_unit,

		       theData[2] ? (theData[1]*100)/theData[2] : 0,

		       theData[2] ? (Uint32)((((Uint64)theData[1])*100)/theData[2]) : 0,

		       alloc, alloc_unit,

		       theData[3] ? (theData[2]*100)/theData[3] : 0,

		       theData[3] ? (Uint32)((((Uint64)theData[2])*100)/theData[3]) : 0,

		       max_, max_unit,

		       theData[4]+(((Uint64)theData[5])<<32),

		       theData[6]+(((Uint64)theData[7])<<32));

storage/ndb/src/kernel/blocks/dbdih/Dbdih.hpp

+2 −0
Original line number Diff line number Diff line
@@ -1645,6 +1645,8 @@ private: 
  // NR

  Uint32 c_dictLockSlavePtrI_nodeRestart; // userPtr for NR

  void recvDictLockConf_nodeRestart(Signal* signal, Uint32 data, Uint32 ret);



  Uint32 c_error_7181_ref;

};



#if (DIH_CDATA_SIZE < _SYSFILE_SIZE32)

storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp

+6 −1
Original line number Diff line number Diff line
@@ -5101,6 +5101,7 @@ void Dbdih::execMASTER_GCPREQ(Signal* signal) 
  {

    ndbout_c("execGCP_TCFINISHED in MASTER_GCPREQ");

    CLEAR_ERROR_INSERT_VALUE;

    signal->theData[0] = c_error_7181_ref;

    signal->theData[1] = coldgcp;

    execGCP_TCFINISHED(signal);

  }
@@ -5176,6 +5177,7 @@ void Dbdih::execMASTER_GCPREQ(Signal* signal) 
  {

    ndbout_c("execGCP_TCFINISHED in MASTER_GCPREQ");

    CLEAR_ERROR_INSERT_VALUE;

    signal->theData[0] = c_error_7181_ref;

    signal->theData[1] = coldgcp;

    execGCP_TCFINISHED(signal);

  }
@@ -8078,6 +8080,7 @@ void Dbdih::execGCP_COMMIT(Signal* signal) 
  cgckptflag = false;

  emptyverificbuffer(signal, true);

  cgcpParticipantState = GCP_PARTICIPANT_COMMIT_RECEIVED;

  signal->theData[0] = calcDihBlockRef(masterNodeId);

  signal->theData[1] = coldgcp;

  sendSignal(clocaltcblockref, GSN_GCP_NOMORETRANS, signal, 2, JBB);

  return;
@@ -8087,11 +8090,13 @@ void Dbdih::execGCP_TCFINISHED(Signal* signal) 
{

  jamEntry();

  CRASH_INSERTION(7007);

  Uint32 retRef = signal->theData[0];

  Uint32 gci = signal->theData[1];

  ndbrequire(gci == coldgcp);









  if (ERROR_INSERTED(7181) || ERROR_INSERTED(7182))









  {









    c_error_7181_ref = retRef; // Save ref









    ndbout_c("killing %d", refToNode(cmasterdihref));









    signal->theData[0] = 9999;









    sendSignal(numberToRef(CMVMI, refToNode(cmasterdihref)),








@@ -8103,7 +8108,7 @@ void Dbdih::execGCP_TCFINISHED(Signal* signal)







  signal->theData[0] = cownNodeId;









  signal->theData[1] = coldgcp;









  signal->theData[2] = cfailurenr;









  sendSignal(cmasterdihref, GSN_GCP_NODEFINISH, signal, 3, JBB);









  sendSignal(retRef, GSN_GCP_NODEFINISH, signal, 3, JBB);









}//Dbdih::execGCP_TCFINISHED()

















/*****************************************************************************/