Commit c9614944 authored by jani@hynda.(none)'s avatar jani@hynda.(none)
Browse files

Added useful exit error code for programs using my_getopt in case 

of an error in option handling. This can sometimes be useful in
scripts.

Changed some exit code names and corresponding numbers.

Fixed a bug in mysqld.cc, in replication related options.

Added a global flag in my_getopt, which can be set by any program
that is using my_getopt, which tells whether the client should
print the error message itself, or whether my_getopt should do it.
The default is that my_getopt will print the error messages.
parent 51883b32

client/mysql.cc

+2 −6
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ 
#include <signal.h>

#include <violite.h>



const char *VER= "12.7";

const char *VER= "12.8";



/* Don't try to make a nice table if the data is too big */

#define MAX_COLUMN_LENGTH	     1024
@@ -739,11 +739,7 @@ static int get_options(int argc, char **argv) 
  strmov(default_pager, pager);



  if ((ho_error=handle_options(&argc, &argv, my_long_options, get_one_option)))

  {

    printf("%s: handle_options() failed with error %d\n", my_progname,

	   ho_error);

    exit(1);

  }

    exit(ho_error);



  if (status.batch) /* disable pager and outfile in this case */

  {

client/mysqladmin.c

+3 −6
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ 
#include <my_pthread.h>				/* because of signal()	*/

#endif



#define ADMIN_VERSION "8.34"

#define ADMIN_VERSION "8.35"

#define MAX_MYSQL_VAR 64

#define SHUTDOWN_DEF_TIMEOUT 3600		/* Wait for shutdown */

#define MAX_TRUNC_LENGTH 3
@@ -247,11 +247,8 @@ int main(int argc,char *argv[]) 
     free_defaults()

  */

  if ((ho_error=handle_options(&argc, &argv, my_long_options, get_one_option)))

  {

    printf("%s: handle_options() failed with error %d\n", my_progname,

	   ho_error);

    exit(1);

  }

    exit(ho_error);



  if (argc == 0)

  {

    usage();

client/mysqlbinlog.cc

+3 −6
Original line number Diff line number Diff line
@@ -124,7 +124,7 @@ static void die(const char* fmt, ...) 


static void print_version()

{

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

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

}
@@ -223,11 +223,8 @@ static int parse_args(int *argc, char*** argv) 


  result_file = stdout;

  if ((ho_error=handle_options(argc, argv, my_long_options, get_one_option)))

  {

    printf("%s: handle_options() failed with error %d\n", my_progname,

	   ho_error);

    exit(1);

  }

    exit(ho_error);



  return 0;

}

client/mysqlcheck.c

+2 −6
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 


/* By Jani Tolonen, 2001-04-20, MySQL Development Team */



#define CHECK_VERSION "2.3"

#define CHECK_VERSION "2.4"



#include "client_priv.h"

#include <m_ctype.h>
@@ -265,11 +265,7 @@ static int get_options(int *argc, char ***argv) 
  load_defaults("my", load_default_groups, argc, argv);



  if ((ho_error=handle_options(argc, argv, my_long_options, get_one_option)))

  {

    printf("%s: handle_options() failed with error %d\n", my_progname,

	   ho_error);

    exit(1);

  }

    exit(ho_error);



  if (!what_to_do)

  {

client/mysqldump.c

+2 −6
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ 
** and adapted to mysqldump 05/11/01 by Jani Tolonen

*/



#define DUMP_VERSION "9.05"

#define DUMP_VERSION "9.06"



#include <my_global.h>

#include <my_sys.h>
@@ -360,11 +360,7 @@ static int get_options(int *argc, char ***argv) 
  load_defaults("my",load_default_groups,argc,argv);



  if ((ho_error=handle_options(argc, argv, my_long_options, get_one_option)))

  {

    printf("%s: handle_options() failed with error %d\n", my_progname,

	   ho_error);

    exit(1);

  }

    exit(ho_error);



  if (opt_delayed)

    opt_lock=0;				/* Can't have lock with delayed */