diff options
| author | Vladislav Vaintroub <wlad@montyprogram.com> | 2011-01-29 18:51:12 +0100 |
|---|---|---|
| committer | Vladislav Vaintroub <wlad@montyprogram.com> | 2011-01-29 18:51:12 +0100 |
| commit | b19e99865ccf3e946ebe59bf09add8e0452904ac (patch) | |
| tree | 23cb9e8176ef9d0e276b47d197e11d195b2ecafb /scripts/mysql_install_db.pl.in | |
| parent | 3edf4dcd5a36be8d5acc94e0c5e29e77e47cd15b (diff) | |
| download | mariadb-git-b19e99865ccf3e946ebe59bf09add8e0452904ac.tar.gz | |
MWL#55 : cherrypick MySQL 5.5 CMake/build improvements in order
to be able to build MSI based installer
Diffstat (limited to 'scripts/mysql_install_db.pl.in')
| -rw-r--r-- | scripts/mysql_install_db.pl.in | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/scripts/mysql_install_db.pl.in b/scripts/mysql_install_db.pl.in index 18bd713c041..0985c27f0ec 100644 --- a/scripts/mysql_install_db.pl.in +++ b/scripts/mysql_install_db.pl.in @@ -360,7 +360,7 @@ my $hostname = hostname(); my $resolved; if ( !$opt->{'cross-bootstrap'} and !$opt->{rpm} and !$opt->{force} ) { - my $resolveip; + my $resolveip = $bindir/resolveip; $resolved = `$resolveip $hostname 2>&1`; if ( $? != 0 ) @@ -418,9 +418,7 @@ my $mysqld_install_cmd_line = quote_options($mysqld_bootstrap, "--bootstrap", "--basedir=$opt->{basedir}", "--datadir=$opt->{ldata}", - "--skip-innodb", - "--skip-bdb", - "--skip-ndbcluster", + "--loose-skip-innodb", "--max_allowed_packet=8M", "--net_buffer_length=16K", @args, |