1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixes for 4.1 to be as in 5.0 and above.

Browse Source 
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.
This commit is contained in:
unknown 2007-03-27 18:51:02 +03:00
parent 137083e331
commit 454e889f44
4 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
client/mysql.cc
View File

@ -440,7 +440,7 @@ int main(int argc,char *argv[])
put_info((char*) glob_buffer.ptr(),INFO_INFO); put_info((char*) glob_buffer.ptr(),INFO_INFO);
#ifdef HAVE_READLINE #ifdef HAVE_READLINE
initialize_readline(my_progname); initialize_readline((char*) my_progname);
if (!status.batch && !quick && !opt_html && !opt_xml) if (!status.batch && !quick && !opt_html && !opt_xml)
{ {
/* read-history from file, default ~/.mysql_history*/ /* read-history from file, default ~/.mysql_history*/

2
client/mysqldump.c
View File

@ -2654,7 +2654,7 @@ int main(int argc, char **argv)
default_charset= (char *)mysql_universal_client_charset; default_charset= (char *)mysql_universal_client_charset;
bzero((char*) &ignore_table, sizeof(ignore_table)); bzero((char*) &ignore_table, sizeof(ignore_table));
MY_INIT(argv[0]); MY_INIT("mysqldump");
if (get_options(&argc, &argv)) if (get_options(&argc, &argv))
{ {
my_end(0); my_end(0);

2
include/my_sys.h
View File

@ -203,7 +203,7 @@ extern int errno; /* declare errno */
extern const char ** NEAR my_errmsg[]; extern const char ** NEAR my_errmsg[];
extern char NEAR errbuff[NRERRBUFFS][ERRMSGSIZE]; extern char NEAR errbuff[NRERRBUFFS][ERRMSGSIZE];
extern char *home_dir; /* Home directory for user */ 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 char NEAR curr_dir[]; /* Current directory for user */
extern int (*error_handler_hook)(uint my_err, const char *str,myf MyFlags); 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, extern int (*fatal_error_handler_hook)(uint my_err, const char *str,

3
mysys/my_static.c
View File

@ -26,7 +26,8 @@
#endif #endif
/* from my_init */ /* 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}, char NEAR curr_dir[FN_REFLEN]= {0},
NEAR home_dir_buff[FN_REFLEN]= {0}; NEAR home_dir_buff[FN_REFLEN]= {0};
ulong my_stream_opened=0,my_file_opened=0, my_tmp_file_created=0; ulong my_stream_opened=0,my_file_opened=0, my_tmp_file_created=0;