summaryrefslogtreecommitdiff
path: root/scripts/mysql_install_db.sh
diff options
context:
space:
mode:
authormmj@tiger.mmj.dk <>2007-01-11 09:19:32 +0100
committermmj@tiger.mmj.dk <>2007-01-11 09:19:32 +0100
commit49913f2a95d8dcb3ff05160f4c5bf22222bb5f26 (patch)
tree255d4cdb83d5c64b996d7d22b14af8b5f4ee8b06 /scripts/mysql_install_db.sh
parent27d56afcfc5c7ccb7793d15f5643fcc058ceaa51 (diff)
parentba7b6e86f269ed5a634af13f422b92be3294431c (diff)
downloadmariadb-git-49913f2a95d8dcb3ff05160f4c5bf22222bb5f26.tar.gz
Merge mjorgensen@bk-internal.mysql.com:/home/bk/mysql-5.0-sage
into tiger.mmj.dk:/Users/mmj/bktrees/mysql-5.0
Diffstat (limited to 'scripts/mysql_install_db.sh')
-rw-r--r--scripts/mysql_install_db.sh3
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 \