Skip to content

M
mariadb
Commit ec6476cb authored by tomas@whalegate.ndb.mysql.com's avatar tomas@whalegate.ndb.mysql.com
Browse files
Options

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

into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
parents 537af124 b86f256d
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 1 deletion
storage/ndb/src/ndbapi/Ndb.cpp
View file @ ec6476cb
...@@ -1234,6 +1234,7 @@ int Ndb::setSchemaName(const char * a_schema_name) ...@@ -1234,6 +1234,7 @@ int Ndb::setSchemaName(const char * a_schema_name)
return -1; return -1;
} }
} }
return 0;
} }
// </internal> // </internal>
......
storage/ndb/src/ndbapi/Ndbif.cpp
View file @ ec6476cb
...@@ -940,7 +940,7 @@ Ndb::handleReceivedSignal(NdbApiSignal* aSignal, LinearSectionPtr ptr[3]) ...@@ -940,7 +940,7 @@ Ndb::handleReceivedSignal(NdbApiSignal* aSignal, LinearSectionPtr ptr[3])
InvalidSignal: InvalidSignal:
#ifdef VM_TRACE #ifdef VM_TRACE
ndbout_c("Ndbif: Error Ndb::handleReceivedSignal " 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)", " sender = (Block: %d Node: %d)",
tFirstDataPtr, tFirstDataPtr,
tSignalNumber, tSignalNumber,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7