diff options
author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-10-28 09:14:51 +0300 |
---|---|---|
committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-10-28 09:14:51 +0300 |
commit | d7af7bfc2b6ab89801059406e1bd74846a2ca8e8 (patch) | |
tree | 100f8775b81add8fba526d279cb0b0cb0e3fa6d6 /mysys | |
parent | a52cd4aedac70676eb100afc8779eb694ccd8dce (diff) | |
parent | d8c6c53a0658ea8315252997f65d796b13182387 (diff) | |
download | mariadb-git-d7af7bfc2b6ab89801059406e1bd74846a2ca8e8.tar.gz |
Merge 10.6 into 10.7
Diffstat (limited to 'mysys')
-rw-r--r-- | mysys/safemalloc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysys/safemalloc.c b/mysys/safemalloc.c index 57ffd28a336..edfe3b18479 100644 --- a/mysys/safemalloc.c +++ b/mysys/safemalloc.c @@ -372,9 +372,9 @@ int sf_sanity() if (count || irem) { warn("Error: Safemalloc link list destroyed"); - return 1; + flag= 1; } - return 0; + return flag; } /** |