diff options
| author | unknown <mmj@tiger.mmj.dk> | 2007-01-11 09:19:32 +0100 |
|---|---|---|
| committer | unknown <mmj@tiger.mmj.dk> | 2007-01-11 09:19:32 +0100 |
| commit | 64dcf6f3dedc3fef3c0e7e06566cfab363198466 (patch) | |
| tree | 255d4cdb83d5c64b996d7d22b14af8b5f4ee8b06 /scripts | |
| parent | 41ed9b72b7ed0844147a930156ae0578a94a1903 (diff) | |
| parent | 7b4f0c404136feedd4802274adfd5cc79eb42bcc (diff) | |
| download | mariadb-git-64dcf6f3dedc3fef3c0e7e06566cfab363198466.tar.gz | |
Merge mjorgensen@bk-internal.mysql.com:/home/bk/mysql-5.0-sage
into tiger.mmj.dk:/Users/mmj/bktrees/mysql-5.0
configure.in:
Auto merged
mysql-test/install_test_db.sh:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
scripts/mysql_install_db.sh:
Auto merged
sql/CMakeLists.txt:
Auto merged
sql/mysqld.cc:
Auto merged
win/configure.js:
Auto merged
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/mysql_install_db.sh | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/scripts/mysql_install_db.sh b/scripts/mysql_install_db.sh index 714b5387f79..0e89a32aa66 100644 --- a/scripts/mysql_install_db.sh +++ b/scripts/mysql_install_db.sh @@ -236,7 +236,8 @@ if test "$in_rpm" -eq 0 -a "$windows" -eq 0 then echo "Installing all prepared tables" fi -mysqld_install_cmd_line="$mysqld $defaults $mysqld_opt --bootstrap \ +mysqld_bootstrap="${MYSQLD_BOOTSTRAP-$mysqld}" +mysqld_install_cmd_line="$mysqld_bootstrap $defaults $mysqld_opt --bootstrap \ --skip-grant-tables --basedir=$basedir --datadir=$ldata --skip-innodb \ --skip-bdb --skip-ndbcluster $args --max_allowed_packet=8M --net_buffer_length=16K" if $scriptdir/mysql_create_system_tables $create_option $mdata $hostname $windows \ |