Merge 5.3->5.5

1 files changed, 4 insertions, 8 deletions

diff --git a/mysys/stacktrace.c b/mysys/stacktrace.c
index db51195db25..c4c863404b4 100644
--- a/mysys/stacktrace.c
+++ b/mysys/stacktrace.c
@@ -661,10 +661,9 @@ void my_print_stacktrace(uchar* unused1, ulong unused2)
       my_safe_printf_stderr("%s!", base_image_name);
     }
     if(have_symbol)
-      my_safe_printf_stderr("%s()", package.sym.Name);
-
+      fprintf(stderr, "%s()", package.sym.Name);
     else if(have_module)
-      my_safe_printf_stderr("%s", "???");
+      fprintf(stderr,"%s", "???");
 
     if(have_source)
     {
@@ -672,7 +671,7 @@ void my_print_stacktrace(uchar* unused1, ulong unused2)
       my_safe_printf_stderr("[%s:%u]",
                             base_file_name, line.LineNumber);
     }
-    my_safe_printf_stderr("%s", "\n");
+    fprintf(stderr,"%s", "\n");
   }
 }
 
@@ -746,10 +745,7 @@ void my_safe_print_str(const char *val, int len)
 #ifdef __WIN__
 size_t my_write_stderr(const void *buf, size_t count)
 {
-  DWORD bytes_written;
-  SetFilePointer(GetStdHandle(STD_ERROR_HANDLE), 0, NULL, FILE_END);
-  WriteFile(GetStdHandle(STD_ERROR_HANDLE), buf, count, &bytes_written, NULL);
-  return bytes_written;
+  return fwrite(buf, 1, count, stderr);
 }
 #else
 size_t my_write_stderr(const void *buf, size_t count)