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

into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1


sql/sql_lex.h:
  Auto merged
storage/ndb/src/common/transporter/TransporterRegistry.cpp:
  Auto merged
This commit is contained in:
unknown 2005-06-16 12:02:17 +02:00
commit 21826d20a4
9 changed files with 72 additions and 21 deletions

View file

@ -1208,7 +1208,7 @@ TransporterRegistry::report_connect(NodeId node_id)
void
TransporterRegistry::report_disconnect(NodeId node_id, int errnum)
{
DBUG_ENTER("TransporterRegistry::report_connect");
DBUG_ENTER("TransporterRegistry::report_disconnect");
DBUG_PRINT("info",("performStates[%d]=DISCONNECTED",node_id));
performStates[node_id] = DISCONNECTED;
reportDisconnect(callbackObj, node_id, errnum);