summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authordlenev@mysql.com <>2005-05-09 17:26:59 +0400
committerdlenev@mysql.com <>2005-05-09 17:26:59 +0400
commitfa8bf7bc09e1f812b36ec210e7937c624f3ec014 (patch)
treeaf61439873804d7d01c589c7531b04afd8004974 /scripts
parentcc29d0a234f8bbc334b5f76103602c67ed651a94 (diff)
parentfeb8a43c4d1ef577402d37939893c35b269213cf (diff)
downloadmariadb-git-fa8bf7bc09e1f812b36ec210e7937c624f3ec014.tar.gz
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/dlenev/src/mysql-5.0-merges
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 ""