summaryrefslogtreecommitdiff
path: root/scripts/mysql_install_db.sh
diff options
context:
space:
mode:
authortsmith@siva.hindu.god <>2007-01-11 13:50:48 -0700
committertsmith@siva.hindu.god <>2007-01-11 13:50:48 -0700
commitbc0e0ba7cc1266adb76a34558d0b8a1c1dbef4fe (patch)
treed5ad489509eb68843615a2f7425506f6d90d1fef /scripts/mysql_install_db.sh
parentd90427abaa626f4580f3f8cca9c7461e9a330aae (diff)
parentba7b6e86f269ed5a634af13f422b92be3294431c (diff)
downloadmariadb-git-bc0e0ba7cc1266adb76a34558d0b8a1c1dbef4fe.tar.gz
Merge siva.hindu.god:/home/tsmith/m/bk/mysql-5.0-build
into siva.hindu.god:/home/tsmith/m/bk/mysql-5.1-build
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 a4b187e3243..59645d090c4 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-ndbcluster $args --max_allowed_packet=8M --net_buffer_length=16K"
if $scriptdir/mysql_create_system_tables $create_option $mdata $hostname $windows \