database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-01-06 05:22:24 +03:00
Code Activity

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

Browse Source 
into poseidon.(none):/home/tomas/mysql-4.1-ndb-merge
This commit is contained in:
tomas@poseidon.(none)
2004-09-16 08:23:37 +00:00
parent e39a5033f2 5488f207db
commit 9df9132183
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ndb/src/common/util/SocketClient.cpp
View File

@@ -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;
}
}

2
scripts/mysql_install_db.sh
View File

@@ -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