Commit 3f421aa4 authored by unknown's avatar unknown
Browse files

Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb 

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


storage/ndb/src/ndbapi/Ndb.cpp:
  Auto merged
storage/ndb/src/ndbapi/Ndbif.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp:
  null merge
parents 96d1ae8b 1810062e

storage/ndb/src/ndbapi/Ndb.cpp

+1 −0
Original line number Diff line number Diff line
@@ -1234,6 +1234,7 @@ int Ndb::setSchemaName(const char * a_schema_name) 
      return -1;

    }

  }

  return 0;

}

// </internal>

storage/ndb/src/ndbapi/Ndbif.cpp

+1 −1
Original line number Diff line number Diff line
@@ -940,7 +940,7 @@ Ndb::handleReceivedSignal(NdbApiSignal* aSignal, LinearSectionPtr ptr[3]) 
 InvalidSignal:

#ifdef VM_TRACE

  ndbout_c("Ndbif: Error Ndb::handleReceivedSignal "

	   "(tFirstDataPtr=%x, GSN=%d, theImpl->theWaiter.m_state=%d)"

	   "(tFirstDataPtr=%p, GSN=%d, theImpl->theWaiter.m_state=%d)"

	   " sender = (Block: %d Node: %d)",

           tFirstDataPtr,

	   tSignalNumber,