summaryrefslogtreecommitdiff
path: root/dbug
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2022-06-09 13:34:52 +0300
committerMarko Mäkelä <marko.makela@mariadb.com>2022-06-09 13:34:52 +0300
commite11b82f8f5c7006f7bf271f0db8e8c514cc9baad (patch)
treed44b413b5cd14a296a0069eea9e82c1f26f3b61e /dbug
parent77b3959b5c1528f33ada7aa4445cccf5b5e197b0 (diff)
parenta9d0bb12e68a11c119a3534f354c7a7ef13dd5b5 (diff)
downloadmariadb-git-e11b82f8f5c7006f7bf271f0db8e8c514cc9baad.tar.gz
Merge 10.5 into 10.6
Diffstat (limited to 'dbug')
-rw-r--r--dbug/dbug.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/dbug/dbug.c b/dbug/dbug.c
index 548d82d03e6..1aa587ac246 100644
--- a/dbug/dbug.c
+++ b/dbug/dbug.c
@@ -1997,11 +1997,10 @@ static void DBUGOpenFile(CODE_STATE *cs,
static void DBUGCloseFile(CODE_STATE *cs, sFILE *new_value)
{
sFILE *fp;
- if (!cs || !cs->stack || !cs->stack->out_file)
+ if (!cs || !cs->stack || !(fp= cs->stack->out_file))
return;
- fp= cs->stack->out_file;
- if (--fp->used == 0)
+ if (fp != sstdout && fp != sstderr && --fp->used == 0)
{
if (fclose(fp->file) == EOF)
{