summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authordlenev@mysql.com <>2005-05-09 16:21:57 +0400
committerdlenev@mysql.com <>2005-05-09 16:21:57 +0400
commite7f29e190426d938ae459eb3251127304c872602 (patch)
tree913aa03dab8cd22c346d20e8c9d8a62f3e1b127b /scripts
parent1e889f3beba0f167b6b14ac63ded740f7fa0bf8c (diff)
parent12621f349b5eec8605f3c3993abcaf32b849a712 (diff)
downloadmariadb-git-e7f29e190426d938ae459eb3251127304c872602.tar.gz
Manual merge of fix for bug #9913 into 5.0 tree.
Diffstat (limited to 'scripts')
-rw-r--r--scripts/mysql_install_db.sh5
1 files changed, 1 insertions, 4 deletions
diff --git a/scripts/mysql_install_db.sh b/scripts/mysql_install_db.sh
index e1e2d4ce148..33db1eae82a 100644
--- a/scripts/mysql_install_db.sh
+++ b/scripts/mysql_install_db.sh
@@ -11,7 +11,6 @@ in_rpm=0
windows=0
defaults=""
user=""
-tmp_file=/tmp/mysql_install_db.$$
case "$1" in
--no-defaults|--defaults-file=*|--defaults-extra-file=*)
@@ -223,10 +222,8 @@ then
then
echo "Fill help tables"
fi
- echo "use mysql;" > $tmp_file
- cat $tmp_file $fill_help_tables | eval "$mysqld_install_cmd_line"
+ (echo "use mysql;"; cat $fill_help_tables) | eval "$mysqld_install_cmd_line"
res=$?
- rm $tmp_file
if test $res != 0
then
echo ""