diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2018-01-04 09:22:59 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2018-01-04 09:22:59 +0200 |
| commit | 145ae15a33210e13d33d6f41b145b3f04cab2263 (patch) | |
| tree | 02810e3c0d629f7d7def2dbc663154cbdb53242f /mysys/my_malloc.c | |
| parent | acd2862e65a6555fba6065b7b4ded8513e2ce37c (diff) | |
| parent | 1a1bda2222e0c2ab41baed1510f6fbca80c20d31 (diff) | |
| download | mariadb-git-145ae15a33210e13d33d6f41b145b3f04cab2263.tar.gz | |
Merge bb-10.2-ext into 10.3
Diffstat (limited to 'mysys/my_malloc.c')
| -rw-r--r-- | mysys/my_malloc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysys/my_malloc.c b/mysys/my_malloc.c index 2b022522f67..6b24f777aaa 100644 --- a/mysys/my_malloc.c +++ b/mysys/my_malloc.c @@ -109,7 +109,7 @@ void *my_malloc(size_t size, myf my_flags) my_error(EE_OUTOFMEMORY, MYF(ME_BELL + ME_WAITTANG + ME_NOREFRESH + ME_FATALERROR),size); if (my_flags & MY_FAE) - exit(1); + abort(); } else { |