Commit 454e889f authored by unknown's avatar unknown
Browse files

Fixes for 4.1 to be as in 5.0 and above. 


client/mysql.cc:
  Fixed to be as in 5.0 and above.
client/mysqldump.c:
  Fixed to be as in 5.0 and above.
include/my_sys.h:
  Fixed to be as in 5.0 and above.
mysys/my_static.c:
  Fixed to be as in 5.0 and above.
parent 137083e3

client/mysql.cc

+1 −1
Original line number Diff line number Diff line
@@ -440,7 +440,7 @@ int main(int argc,char *argv[]) 
  put_info((char*) glob_buffer.ptr(),INFO_INFO);



#ifdef HAVE_READLINE

  initialize_readline(my_progname);

  initialize_readline((char*) my_progname);

  if (!status.batch && !quick && !opt_html && !opt_xml)

  {

    /* read-history from file, default ~/.mysql_history*/

client/mysqldump.c

+1 −1
Original line number Diff line number Diff line
@@ -2654,7 +2654,7 @@ int main(int argc, char **argv) 
  default_charset= (char *)mysql_universal_client_charset;

  bzero((char*) &ignore_table, sizeof(ignore_table));



  MY_INIT(argv[0]);

  MY_INIT("mysqldump");

  if (get_options(&argc, &argv))

  {

    my_end(0);

include/my_sys.h

+1 −1
Original line number Diff line number Diff line
@@ -203,7 +203,7 @@ extern int errno; /* declare errno */ 
extern const char ** NEAR my_errmsg[];

extern char NEAR errbuff[NRERRBUFFS][ERRMSGSIZE];

extern char *home_dir;			/* Home directory for user */

extern char *my_progname;		/* program-name (printed in errors) */

extern const char *my_progname;		/* program-name (printed in errors) */

extern char NEAR curr_dir[];		/* Current directory for user */

extern int (*error_handler_hook)(uint my_err, const char *str,myf MyFlags);

extern int (*fatal_error_handler_hook)(uint my_err, const char *str,

mysys/my_static.c

+2 −1
Original line number Diff line number Diff line
@@ -26,7 +26,8 @@ 
#endif



	/* from my_init */

my_string	home_dir=0,my_progname=0;

my_string	home_dir=0;

const char      *my_progname=0;

char		NEAR curr_dir[FN_REFLEN]= {0},

		NEAR home_dir_buff[FN_REFLEN]= {0};

ulong		my_stream_opened=0,my_file_opened=0, my_tmp_file_created=0;