summaryrefslogtreecommitdiff
path: root/mysys
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2021-10-28 08:28:39 +0300
committerMarko Mäkelä <marko.makela@mariadb.com>2021-10-28 08:28:39 +0300
commit3a79e5fd317316c293baa459e8296fdb0744c280 (patch)
tree9ff2059bbd651715daa6a1d7241c0ddd303c0071 /mysys
parent7948a1dc53eccc23095a83daa5fd6b3bfaedf7f2 (diff)
parent657bcf928eb1c6a80ee2c82f0dcdd59ab02927e4 (diff)
downloadmariadb-git-3a79e5fd317316c293baa459e8296fdb0744c280.tar.gz
Merge 10.3 into 10.4
Diffstat (limited to 'mysys')
-rw-r--r--mysys/safemalloc.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/mysys/safemalloc.c b/mysys/safemalloc.c
index d38c3bcfb66..034b6f2536b 100644
--- a/mysys/safemalloc.c
+++ b/mysys/safemalloc.c
@@ -354,9 +354,9 @@ int sf_sanity()
if (count || irem)
{
warn("Error: Safemalloc link list destroyed");
- return 1;
+ flag= 1;
}
- return 0;
+ return flag;
}
/**