diff options
author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-01-17 11:24:38 +0200 |
---|---|---|
committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-01-17 11:24:38 +0200 |
commit | 8e80fd6bfdf2ea7d1870662ecd4d8129f3c76301 (patch) | |
tree | c3ed8b49caac6119deb2e3839f8c0b8662e35b8b /mysys | |
parent | f3e9d9a6e6b2614bf5d57ccf9434c980e4a90424 (diff) | |
parent | c1aae370879490dc0a3cd63c5b1010fa21b1f62c (diff) | |
download | mariadb-git-8e80fd6bfdf2ea7d1870662ecd4d8129f3c76301.tar.gz |
Merge 10.1 into 10.2
Diffstat (limited to 'mysys')
-rw-r--r-- | mysys/safemalloc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysys/safemalloc.c b/mysys/safemalloc.c index 9916650308a..ea74d1ec78e 100644 --- a/mysys/safemalloc.c +++ b/mysys/safemalloc.c @@ -285,8 +285,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 |