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

into poseidon.(none):/home/tomas/mysql-4.1-ndb-merge

ndb/src/common/util/SocketClient.cpp

@@ -66,7 +66,9 @@ SocketClient::connect()
   if (m_sockfd < 0)
   {
     if (!init()) {
+#ifdef VM_TRACE
       ndbout << "SocketClient::connect() failed " << m_server_name << " " << m_port << endl;
+#endif
       return -1;
     }
   }

scripts/mysql_install_db.sh

@@ -213,7 +213,7 @@ then
 fi
 mysqld_install_cmd_line="$mysqld $defaults $mysqld_opt --bootstrap \
 --skip-grant-tables --basedir=$basedir --datadir=$ldata --skip-innodb \
---skip-bdb $args --max_allowed_packet=8M"
+--skip-bdb --skip-ndbcluster $args --max_allowed_packet=8M"
 if $scriptdir/mysql_create_system_tables $create_option $mdata $hostname $windows \
    | eval "$mysqld_install_cmd_line" 
 then