summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorserg@serg.mylan <>2003-10-07 20:41:07 +0200
committerserg@serg.mylan <>2003-10-07 20:41:07 +0200
commit9d198d35bfe78449fc7de49be5d40d2c7cc98f27 (patch)
tree861115d5e43f6893d483a985197f5bad6305957c /scripts
parent511589a4f820d7ff31dda49531bd0dfba26ac9e3 (diff)
parented5d059202d2a2052e77eb974a20ad337abe0016 (diff)
downloadmariadb-git-9d198d35bfe78449fc7de49be5d40d2c7cc98f27.tar.gz
merged
Diffstat (limited to 'scripts')
-rw-r--r--scripts/Makefile.am8
-rw-r--r--scripts/mysql_install_db.sh2
2 files changed, 5 insertions, 5 deletions
diff --git a/scripts/Makefile.am b/scripts/Makefile.am
index c83b0d0b043..17b98fe45c3 100644
--- a/scripts/Makefile.am
+++ b/scripts/Makefile.am
@@ -17,7 +17,6 @@
## Process this file with automake to create Makefile.in
bin_SCRIPTS = @server_scripts@ \
- make_win_src_distribution \
msql2mysql \
mysql_config \
mysql_fix_privilege_tables \
@@ -33,7 +32,8 @@ bin_SCRIPTS = @server_scripts@ \
mysqldumpslow \
mysql_explain_log \
mysql_tableinfo \
- mysqld_multi
+ mysqld_multi \
+ make_win_src_distribution
EXTRA_SCRIPTS = make_binary_distribution.sh \
make_win_src_distribution.sh \
@@ -66,7 +66,6 @@ pkgdata_DATA = make_binary_distribution
# failures with it.
CLEANFILES = @server_scripts@ \
make_binary_distribution \
- make_win_src_distribution \
msql2mysql \
mysql_config \
mysql_fix_privilege_tables \
@@ -79,7 +78,8 @@ CLEANFILES = @server_scripts@ \
mysql_find_rows \
mysqlhotcopy \
mysqldumpslow \
- mysqld_multi
+ mysqld_multi \
+ make_win_src_distribution
SUPERCLEANFILES = mysqlbug
diff --git a/scripts/mysql_install_db.sh b/scripts/mysql_install_db.sh
index d66c33c16b1..5a6b11fb19b 100644
--- a/scripts/mysql_install_db.sh
+++ b/scripts/mysql_install_db.sh
@@ -136,7 +136,7 @@ then
fi
fi
-if test "$ip_only" -eq 1
+if test "$ip_only" ="1"
then
ip=`echo "$resolved" | awk '/ /{print $6}'`
hostname=$ip