Simple cleanups

client/mysqlbinlog.cc:
  Add default handling to mysqlbinlog
mysql-test/mysql-test-run.sh:
  Cleanup of mysqldump/mysqlbinlog argument handling
scripts/Makefile.am:
  Remove duplicate
scripts/mysql_install_db.sh:
  Change -eq to =

client/mysqlbinlog.cc

@@ -40,6 +40,7 @@ static FILE *result_file;
 #ifndef DBUG_OFF
 static const char* default_dbug_option = "d:t:o,/tmp/mysqlbinlog.trace";
 #endif
+static const char *load_default_groups[]= { "mysqlbinlog","client",0 };
 
 void sql_print_error(const char *format, ...);
 
@@ -278,7 +279,7 @@ static void die(const char* fmt, ...)
 
 static void print_version()
 {
-  printf("%s Ver 2.3 for %s at %s\n", my_progname, SYSTEM_TYPE, MACHINE_TYPE);
+  printf("%s Ver 2.4 for %s at %s\n", my_progname, SYSTEM_TYPE, MACHINE_TYPE);
 }
 
 
@@ -374,6 +375,7 @@ static int parse_args(int *argc, char*** argv)
   int ho_error;
 
   result_file = stdout;
+  load_defaults("my",load_default_groups,argc,argv);
   if ((ho_error=handle_options(argc, argv, my_long_options, get_one_option)))
     exit(ho_error);
 
@@ -743,12 +745,16 @@ void free_tmpdir(MY_TMPDIR *tmpdir)
 
 int main(int argc, char** argv)
 {
+  static char **defaults_argv;
   MY_INIT(argv[0]);
+
   parse_args(&argc, (char***)&argv);
+  defaults_argv=argv;
 
   if (!argc)
   {
     usage();
+    free_defaults(defaults_argv);
     return -1;
   }
 
@@ -778,6 +784,8 @@ int main(int argc, char** argv)
     my_fclose(result_file, MYF(0));
   if (use_remote)
     mysql_close(mysql);
+  free_defaults(defaults_argv);
+  my_end(0);
   return 0;
 }
 

mysql-test/mysql-test-run.sh

@@ -429,14 +429,14 @@ if [ x$SOURCE_DIST = x1 ] ; then
    MYSQL_TEST="$BASEDIR/client/mysqltest"
  fi
  if [ -f "$BASEDIR/client/.libs/mysqldump" ] ; then
-   MYSQL_DUMP="$BASEDIR/client/.libs/mysqldump --no-defaults -uroot --socket=$MASTER_MYSOCK"
+   MYSQL_DUMP="$BASEDIR/client/.libs/mysqldump"
  else
-   MYSQL_DUMP="$BASEDIR/client/mysqldump --no-defaults -uroot --socket=$MASTER_MYSOCK"
+   MYSQL_DUMP="$BASEDIR/client/mysqldump"
  fi
  if [ -f "$BASEDIR/client/.libs/mysqlbinlog" ] ; then
-   MYSQL_BINLOG="$BASEDIR/client/.libs/mysqlbinlog --local-load=$MYSQL_TMP_DIR"
+   MYSQL_BINLOG="$BASEDIR/client/.libs/mysqlbinlog"
  else
-   MYSQL_BINLOG="$BASEDIR/client/mysqlbinlog --local-load=$MYSQL_TMP_DIR"
+   MYSQL_BINLOG="$BASEDIR/client/mysqlbinlog"
  fi
  if [ -n "$STRACE_CLIENT" ]; then
   MYSQL_TEST="strace -o $MYSQL_TEST_DIR/var/log/mysqltest.strace $MYSQL_TEST"
@@ -459,8 +459,8 @@ else
    MYSQLD="$VALGRIND $BASEDIR/bin/mysqld"
  fi
  MYSQL_TEST="$BASEDIR/bin/mysqltest"
- MYSQL_DUMP="$BASEDIR/bin/mysqldump --no-defaults -uroot --socket=$MASTER_MYSOCK"
- MYSQL_BINLOG="$BASEDIR/bin/mysqlbinlog --local-load=$MYSQL_TMP_DIR"
+ MYSQL_DUMP="$BASEDIR/bin/mysqldump"
+ MYSQL_BINLOG="$BASEDIR/bin/mysqlbinlog"
  MYSQLADMIN="$BASEDIR/bin/mysqladmin"
  WAIT_PID="$BASEDIR/bin/mysql_waitpid"
  MYSQL_MANAGER="$BASEDIR/bin/mysqlmanager"
@@ -478,6 +478,8 @@ else
   fi
 fi
 
+MYSQL_DUMP="$MYSQL_DUMP --no-defaults -uroot --socket=$MASTER_MYSOCK"
+MYSQL_BINLOG="$MYSQL_BINLOG --no-defaults --local-load=$MYSQL_TMP_DIR"
 export MYSQL_DUMP
 export MYSQL_BINLOG
 

scripts/Makefile.am

@@ -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 \

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