diff --git a/client/mysql.cc b/client/mysql.cc
index d8810ba3c28..babfa870829 100644
--- a/client/mysql.cc
+++ b/client/mysql.cc
@@ -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*/
diff --git a/client/mysqldump.c b/client/mysqldump.c
index e9d48f3edfa..3bf9fff1b86 100644
--- a/client/mysqldump.c
+++ b/client/mysqldump.c
@@ -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);
diff --git a/include/my_sys.h b/include/my_sys.h
index 4c9a7a7964c..e44f29ffdd8 100644
--- a/include/my_sys.h
+++ b/include/my_sys.h
@@ -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,
diff --git a/mysys/my_static.c b/mysys/my_static.c
index 5f034555156..041569c7f07 100644
--- a/mysys/my_static.c
+++ b/mysys/my_static.c
@@ -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;