diff options
| author | unknown <dlenev@mysql.com> | 2005-05-09 16:21:57 +0400 |
|---|---|---|
| committer | unknown <dlenev@mysql.com> | 2005-05-09 16:21:57 +0400 |
| commit | cb598b10f056e9b93577dc0ca84a7924c06d2904 (patch) | |
| tree | 913aa03dab8cd22c346d20e8c9d8a62f3e1b127b /scripts/mysql_install_db.sh | |
| parent | d6f7a337e7b20c25bf46e5ea2a470983a4efa71c (diff) | |
| parent | dad8efdf6b71eab2f339552053537396a37e00fa (diff) | |
| download | mariadb-git-cb598b10f056e9b93577dc0ca84a7924c06d2904.tar.gz | |
Manual merge of fix for bug #9913 into 5.0 tree.
mysql-test/t/range.test:
Auto merged
scripts/mysql_install_db.sh:
Auto merged
sql/item_func.h:
Auto merged
sql/item_sum.cc:
Auto merged
sql/item_sum.h:
Auto merged
sql/sql_udf.h:
Auto merged
mysql-test/r/mysqldump.result:
Manual merge.
mysql-test/t/mysqldump.test:
Manual merge.
Diffstat (limited to 'scripts/mysql_install_db.sh')
| -rw-r--r-- | scripts/mysql_install_db.sh | 5 |
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 "" |