diff options
| -rw-r--r-- | ndb/src/common/util/SocketClient.cpp | 2 | ||||
| -rw-r--r-- | scripts/mysql_install_db.sh | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/ndb/src/common/util/SocketClient.cpp b/ndb/src/common/util/SocketClient.cpp index ec837babc24..50e60956b94 100644 --- a/ndb/src/common/util/SocketClient.cpp +++ b/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; } } diff --git a/scripts/mysql_install_db.sh b/scripts/mysql_install_db.sh index aa5b99aebcc..b4f59790e73 100644 --- a/scripts/mysql_install_db.sh +++ b/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 |