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

into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-ndb

mysql-test/mysql-test-run.sh

@@ -973,7 +973,13 @@ start_ndbcluster()
     else
       NDBCLUSTER_EXTRA_OPTS="--small"
     fi
-    ./ndb/ndbcluster $NDBCLUSTER_OPTS $NDBCLUSTER_EXTRA_OPTS --initial || exit 1
+    NDB_STARTED=1
+    ./ndb/ndbcluster $NDBCLUSTER_OPTS $NDBCLUSTER_EXTRA_OPTS --initial || NDB_STARTED=0
+    if [ x$NDB_STARTED != x1 ] ; then
+      if [ x$FORCE != x1 ] ; then
+        exit 1
+      fi
+    fi
     NDB_CONNECTSTRING="host=localhost:$NDBCLUSTER_PORT"
   else
     NDB_CONNECTSTRING="$USE_RUNNING_NDBCLUSTER"

mysql-test/r/ndb_autodiscover.result

@@ -353,11 +353,6 @@ drop table t1;
 use test2;
 drop table t2;
 drop database test2;
-show databases;
-Database
-information_schema
-mysql
-test
 use test;
 drop database if exists test_only_ndb_tables;
 create database test_only_ndb_tables;

mysql-test/t/ndb_autodiscover.test

@@ -449,7 +449,6 @@ drop table t1;
 use test2;
 drop table t2;
 drop database test2;
-show databases;
 use test;
 
 #########################################################

ndb/src/mgmapi/mgmapi.cpp

@@ -315,7 +315,7 @@ ndb_mgm_call(NdbMgmHandle handle, const ParserRow<ParserDummy> *command_reply,
     ndbout << "Error in mgm protocol parser. "
 	   << "cmd: '" << cmd
 	   << "' status=" << (Uint32)ctx.m_status
-	   << ", curr=" << (Uint32)ctx.m_currentToken
+	   << ", curr=" << ctx.m_currentToken
 	   << endl;
     DBUG_PRINT("info",("parser.parse returned NULL"));
   } 

sql/ha_ndbcluster.cc

@@ -4901,7 +4901,8 @@ ndb_get_table_statistics(Ndb* ndb, const char * table,
     if (check == -1)
       break;
     
-    Uint64 rows, commits, size, mem;
+    Uint64 rows, commits, mem;
+    Uint32 size;
     pOp->getValue(NdbDictionary::Column::ROW_COUNT, (char*)&rows);
     pOp->getValue(NdbDictionary::Column::COMMIT_COUNT, (char*)&commits);
     pOp->getValue(NdbDictionary::Column::ROW_SIZE, (char*)&size);