Commit c6b21b93 authored by monty@hundin.mysql.fi's avatar monty@hundin.mysql.fi
Browse files

Merge work:/home/bk/mysql-4.0 into hundin.mysql.fi:/my/bk/mysql-4.0

parents c4a2d3d5 c66162b4

client/mysqlbinlog.cc

+1 −2
Original line number Diff line number Diff line
@@ -125,7 +125,7 @@ static void die(const char* fmt, ...) 


static void print_version()

{

  printf("%s Ver 2.0 for %s at %s\n", my_progname, SYSTEM_TYPE, MACHINE_TYPE);

  printf("%s Ver 2.1 for %s at %s\n", my_progname, SYSTEM_TYPE, MACHINE_TYPE);

}
@@ -141,7 +141,6 @@ Dumps a MySQL binary log in a format usable for viewing or for pipeing to\n\ 
the mysql command line client\n\n");

  printf("Usage: %s [options] log-files\n", my_progname);

  my_print_help(my_long_options);

  putchar('\n');

  my_print_variables(my_long_options);

}

client/mysqlmanager-pwgen.c

+1 −2
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
   along with this program; if not, write to the Free Software

   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */



#define MANAGER_PWGEN_VERSION "1.1"

#define MANAGER_PWGEN_VERSION "1.2"



#include <my_global.h>

#include <m_ctype.h>
@@ -72,7 +72,6 @@ void usage() 
  printf("Generates a password file to be used by mysqltest.\n\n");

  printf("Usage: %s [OPTIONS]\n", my_progname);

  my_print_help(my_long_options);

  putchar('\n');

  my_print_variables(my_long_options);

}

client/mysqlmanagerc.c

+2 −2
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
   along with this program; if not, write to the Free Software

   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */



#define MANAGER_CLIENT_VERSION "1.2"

#define MANAGER_CLIENT_VERSION "1.3"



#include <my_global.h>

#include <mysql.h>
@@ -93,7 +93,7 @@ void usage() 
  printf("Command-line client for MySQL manager daemon.\n\n");

  printf("Usage: %s [OPTIONS] < command_file\n", my_progname);

  my_print_help(my_long_options);

  printf("  --no-defaults         Don't read default options from any options file.\n\n");

  printf("  --no-defaults         Don't read default options from any options file.\n");

  my_print_variables(my_long_options);

}

client/mysqltest.c

+2 −2
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ 


**********************************************************************/



#define MTEST_VERSION "1.20"

#define MTEST_VERSION "1.21"



#include <my_global.h>

#include <mysql_embed.h>
@@ -1873,7 +1873,7 @@ void usage() 
  printf("Runs a test against the mysql server and compares output with a results file.\n\n");

  printf("Usage: %s [OPTIONS] [database] < test_file\n", my_progname);

  my_print_help(my_long_options);

  printf("  --no-defaults       Don't read default options from any options file.\n\n");

  printf("  --no-defaults       Don't read default options from any options file.\n");

  my_print_variables(my_long_options);

}

myisam/myisamchk.c

+1 −2
Original line number Diff line number Diff line
@@ -292,7 +292,7 @@ static struct my_option my_long_options[] = 


static void print_version(void)

{

  printf("%s  Ver 2.4 for %s at %s\n", my_progname, SYSTEM_TYPE,

  printf("%s  Ver 2.5 for %s at %s\n", my_progname, SYSTEM_TYPE,

	 MACHINE_TYPE);

}
@@ -380,7 +380,6 @@ static void usage(void) 
		      (It may be VERY slow to do a sort the first time!)");



  print_defaults("my", load_default_groups);

  putchar('\n');

  my_print_variables(my_long_options);

}