diff options
author | Sergei Golubchik <serg@mariadb.org> | 2019-05-04 23:32:45 +0200 |
---|---|---|
committer | Sergei Golubchik <serg@mariadb.org> | 2019-05-07 18:40:36 +0200 |
commit | 88961a28e2694db18acb6d355089e52ac2b9a769 (patch) | |
tree | 237eba3cc014ce043d69340dd735a90193a70467 /sql/log.cc | |
parent | 15c79c41e435758392a1474fccf45978fec1e45c (diff) | |
download | mariadb-git-88961a28e2694db18acb6d355089e52ac2b9a769.tar.gz |
MDEV-17710 "unknown error" with FLUSH LOGS if log directory is not writeable
Diffstat (limited to 'sql/log.cc')
-rw-r--r-- | sql/log.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sql/log.cc b/sql/log.cc index ac885746c62..819ece8f98f 100644 --- a/sql/log.cc +++ b/sql/log.cc @@ -8644,14 +8644,14 @@ void sql_perror(const char *message) redirect stdout and stderr to a file. The streams are reopened only for appending (writing at end of file). */ -extern "C" my_bool reopen_fstreams(const char *filename, - FILE *outstream, FILE *errstream) +bool reopen_fstreams(const char *filename, FILE *outstream, FILE *errstream) { - if (outstream && !my_freopen(filename, "a", outstream)) - return TRUE; - - if (errstream && !my_freopen(filename, "a", errstream)) + if ((outstream && !my_freopen(filename, "a", outstream)) || + (errstream && !my_freopen(filename, "a", errstream))) + { + my_error(ER_CANT_CREATE_FILE, MYF(0), filename, errno); return TRUE; + } /* The error stream must be unbuffered. */ if (errstream) |