summaryrefslogtreecommitdiff
path: root/mysys
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2019-01-17 06:40:24 +0200
committerMarko Mäkelä <marko.makela@mariadb.com>2019-01-17 06:40:24 +0200
commit71eb7626112e5a3d0d0a28dc70b7d117a24c0f40 (patch)
treea38cea8380b1e55d8c033d64605156fe17324847 /mysys
parent038785e1f898db74f6486fe7b9209d842c76308b (diff)
parent19a7656fb12bfae7472658056f400bb81ab99c2f (diff)
downloadmariadb-git-71eb7626112e5a3d0d0a28dc70b7d117a24c0f40.tar.gz
Merge 10.0 into 10.1
Diffstat (limited to 'mysys')
-rw-r--r--mysys/safemalloc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/mysys/safemalloc.c b/mysys/safemalloc.c
index 5d19647c989..08e43d0a80a 100644
--- a/mysys/safemalloc.c
+++ b/mysys/safemalloc.c
@@ -282,8 +282,8 @@ static void warn(const char *format,...)
va_list args;
DBUG_PRINT("error", ("%s", format));
va_start(args,format);
- fflush(stderr);
vfprintf(stderr, format, args);
+ fflush(stderr);
va_end(args);
#ifdef HAVE_BACKTRACE