Merge remote-tracking branch 'origin/5.5' into 10.0

2 files changed, 2 insertions, 2 deletions

diff --git a/mysys/my_fopen.c b/mysys/my_fopen.c
index 4f14bc5aaef..f3d64845526 100644
--- a/mysys/my_fopen.c
+++ b/mysys/my_fopen.c
@@ -143,7 +143,7 @@ static int no_close(void *cookie __attribute__((unused)))
 /*
   A hack around a race condition in the implementation of freopen.
 
-  The race condition steams from the fact that the current fd of
+  The race condition stems from the fact that the current fd of
   the stream is closed before its number is used to duplicate the
   new file descriptor. This defeats the desired atomicity of the
   close and duplicate of dup2().
diff --git a/mysys/stacktrace.c b/mysys/stacktrace.c
index 746b99d6112..2b83c5d5479 100644
--- a/mysys/stacktrace.c
+++ b/mysys/stacktrace.c
@@ -766,7 +766,7 @@ int my_safe_print_str(const char *val, int len)
 
 size_t my_write_stderr(const void *buf, size_t count)
 {
-  return (size_t) write(STDERR_FILENO, buf, count);
+  return (size_t) write(fileno(stderr), buf, count);
 }