diff options
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/Makefile.am | 8 | ||||
| -rw-r--r-- | scripts/mysql_install_db.sh | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/scripts/Makefile.am b/scripts/Makefile.am index 93a6666df39..e846976eceb 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_sharedlib_distribution.sh \ @@ -68,7 +68,6 @@ pkgdata_DATA = make_binary_distribution make_sharedlib_distribution CLEANFILES = @server_scripts@ \ make_binary_distribution \ make_sharedlib_distribution \ - make_win_src_distribution \ msql2mysql \ mysql_config \ mysql_fix_privilege_tables \ @@ -81,7 +80,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 5b8fa4d4113..5a6b11fb19b 100644 --- a/scripts/mysql_install_db.sh +++ b/scripts/mysql_install_db.sh @@ -129,14 +129,14 @@ then fi echo "WARNING: The host '$hostname' could not be looked up with resolveip." echo "This probably means that your libc libraries are not 100 % compatible" - echo "with this binary MySQL version. The MySQL deamon, mysqld, should work" + echo "with this binary MySQL version. The MySQL daemon, mysqld, should work" echo "normally with the exception that host name resolving will not work." echo "This means that you should use IP addresses instead of hostnames" echo "when specifying MySQL privileges !" fi fi -if test "$ip_only" -eq 1 +if test "$ip_only" ="1" then ip=`echo "$resolved" | awk '/ /{print $6}'` hostname=$ip |