mirror of
https://github.com/MariaDB/server.git
synced 2025-01-31 11:01:52 +01:00
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
This commit is contained in:
commit
ec6476cbef
2 changed files with 2 additions and 1 deletions
|
@ -1234,6 +1234,7 @@ int Ndb::setSchemaName(const char * a_schema_name)
|
|||
return -1;
|
||||
}
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
// </internal>
|
||||
|
||||
|
|
|
@ -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,
|
||||
|
|
Loading…
Add table
Reference in a new issue