diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2018-05-29 17:34:49 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2018-05-29 17:34:49 +0300 |
| commit | a3539bbb2ac51dfa2b363d3b4c11784c25d1f256 (patch) | |
| tree | 6b49da1f15e5740adaf5da1c4179760a15b77dc4 /sql/mysqld.cc | |
| parent | c98e6d4b3d4d17ee429c696ac07e0bc4bbe1a81e (diff) | |
| parent | 6f96ff7268dd20d6d3b61931c972e7a43c1efdff (diff) | |
| download | mariadb-git-a3539bbb2ac51dfa2b363d3b4c11784c25d1f256.tar.gz | |
Merge 10.2 into 10.3
Diffstat (limited to 'sql/mysqld.cc')
| -rw-r--r-- | sql/mysqld.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc index dd79cb39f80..dab0fab35e0 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -2192,7 +2192,8 @@ static void mysqld_exit(int exit_code) if (opt_endinfo && global_status_var.global_memory_used) fprintf(stderr, "Warning: Memory not freed: %ld\n", (long) global_status_var.global_memory_used); - if (!opt_debugging && !my_disable_leak_check && exit_code == 0) + if (!opt_debugging && !my_disable_leak_check && exit_code == 0 && + debug_assert_on_not_freed_memory) { #ifdef SAFEMALLOC sf_report_leaked_memory(0); |