Backport: remove dead code.

Reorganize function to reflect that it does not actually uses curses
and that there is no curses variant.

5 files changed, 10 insertions, 11 deletions

diff --git a/mysys/CMakeLists.txt b/mysys/CMakeLists.txt
index 2fbaac7fe72..4c93f5ffd57 100755
--- a/mysys/CMakeLists.txt
+++ b/mysys/CMakeLists.txt
@@ -27,7 +27,7 @@ SET(MYSYS_SOURCES  array.c charset-def.c charset.c checksum.c default.c default_
 				my_clock.c my_compress.c my_copy.c my_crc32.c my_create.c my_delete.c
 				my_div.c my_error.c my_file.c my_fopen.c my_fstream.c my_gethostbyname.c 
 				my_gethwaddr.c my_getopt.c my_getsystime.c my_getwd.c my_handler.c my_init.c
-				my_lib.c my_lock.c my_lockmem.c my_malloc.c my_messnc.c
+				my_lib.c my_lock.c my_lockmem.c my_malloc.c my_mess.c
 				my_mkdir.c my_mmap.c my_net.c my_once.c my_open.c my_pread.c my_pthread.c 
 				my_quick.c my_read.c my_realloc.c my_redel.c my_rename.c my_seek.c my_sleep.c
 				my_static.c my_symlink.c my_symlink2.c my_sync.c my_thr_init.c 
diff --git a/mysys/Makefile.am b/mysys/Makefile.am
index ad7f244e0fb..d5bffd874b2 100644
--- a/mysys/Makefile.am
+++ b/mysys/Makefile.am
@@ -34,7 +34,7 @@ libmysys_a_SOURCES =    my_init.c my_getwd.c mf_getdate.c my_mmap.c \
 			my_vle.c my_atomic.c lf_hash.c \
 			lf_dynarray.c lf_alloc-pin.c \
 			my_fopen.c my_fstream.c my_getsystime.c \
-			my_error.c errors.c my_div.c my_messnc.c \
+			my_error.c errors.c my_div.c my_mess.c \
 			mf_format.c mf_same.c mf_dirname.c mf_fn_ext.c \
 			my_symlink.c my_symlink2.c \
 			mf_pack.c mf_unixpath.c mf_arr_appstr.c \
diff --git a/mysys/my_init.c b/mysys/my_init.c
index 80f9a493bb0..f27f3f7b3e8 100644
--- a/mysys/my_init.c
+++ b/mysys/my_init.c
@@ -204,7 +204,7 @@ void my_end(int infoflag)
       char ebuff[512];
       my_snprintf(ebuff, sizeof(ebuff), EE(EE_OPEN_WARNING),
                   my_file_opened, my_stream_opened);
-      my_message_no_curses(EE_OPEN_WARNING, ebuff, ME_BELL);
+      my_message_stderr(EE_OPEN_WARNING, ebuff, ME_BELL);
       DBUG_PRINT("error", ("%s", ebuff));
       my_print_open_files();
     }
diff --git a/mysys/my_messnc.c b/mysys/my_mess.c
index e2dee3f6710..0ec97525ae8 100644
--- a/mysys/my_messnc.c
+++ b/mysys/my_mess.c
@@ -15,10 +15,10 @@
 
 #include "mysys_priv.h"
 
-void my_message_no_curses(uint error __attribute__((unused)),
-                          const char *str, myf MyFlags)
+void my_message_stderr(uint error __attribute__((unused)),
+                       const char *str, myf MyFlags)
 {
-  DBUG_ENTER("my_message_no_curses");
+  DBUG_ENTER("my_message_stderr");
   DBUG_PRINT("enter",("message: %s",str));
   (void) fflush(stdout);
   if (MyFlags & ME_BELL)
diff --git a/mysys/my_static.c b/mysys/my_static.c
index a86fe6c7ab7..ff5abba29d3 100644
--- a/mysys/my_static.c
+++ b/mysys/my_static.c
@@ -87,10 +87,10 @@ ulong my_time_to_wait_for_lock=2;	/* In seconds */
 char * NEAR globerrs[GLOBERRS];		/* my_error_messages is here */
 #endif
 void (*my_abort_hook)(int) = (void(*)(int)) exit;
-void (*error_handler_hook)(uint error,const char *str,myf MyFlags)=
-    my_message_no_curses;
-void (*fatal_error_handler_hook)(uint error,const char *str,myf MyFlags)=
-  my_message_no_curses;
+void (*error_handler_hook)(uint error, const char *str, myf MyFlags)=
+  my_message_stderr;
+void (*fatal_error_handler_hook)(uint error, const char *str, myf MyFlags)=
+  my_message_stderr;
 
 static const char *proc_info_dummy(void *a __attribute__((unused)),
                                    const char *b __attribute__((unused)),
@@ -123,7 +123,6 @@ my_bool NEAR my_disable_locking=0;
 my_bool NEAR my_disable_async_io=0;
 my_bool NEAR my_disable_flush_key_blocks=0;
 my_bool NEAR my_disable_symlinks=0;
-my_bool NEAR mysys_uses_curses=0;
 
 /*
   Note that PSI_hook and PSI_server are unconditionally