summaryrefslogtreecommitdiff
path: root/dbug
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2022-06-09 14:11:43 +0300
committerMarko Mäkelä <marko.makela@mariadb.com>2022-06-09 14:11:43 +0300
commitfe75e5e5b1c5856fdfc9bd97265ba6ebe272f549 (patch)
tree20b479cb8aa282808152a1dfcbe81f9b7f02676f /dbug
parent09dc322342492aa0ae69346582360eb34c5b9128 (diff)
parente11b82f8f5c7006f7bf271f0db8e8c514cc9baad (diff)
downloadmariadb-git-fe75e5e5b1c5856fdfc9bd97265ba6ebe272f549.tar.gz
Merge 10.6 into 10.7
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)
{