Merge eel.(none):/home/jonas/src/mysql-4.1-push

into  eel.(none):/home/jonas/src/mysql-4.1


mysql-test/t/ndb_config.test:
  Auto merged
ndb/tools/Makefile.am:
  Auto merged
ndb/tools/ndb_config.cpp:
  Auto merged

mysql-test/t/ndb_config.test

 -- source include/have_ndb.inc
--- source include/ndb_default_cluster.inc
 -- source include/not_embedded.inc
 
 --exec $NDB_TOOLS_DIR/ndb_config --no-defaults --query=type,nodeid,host 2> /dev/null