diff options
| author | Sachin Setiya <sachinsetia1001@gmail.com> | 2017-11-03 12:34:05 +0530 |
|---|---|---|
| committer | Sachin Setiya <sachinsetia1001@gmail.com> | 2017-11-03 12:34:05 +0530 |
| commit | 3cecb1bab381c256e43f0f095a7a02b115dfc7bc (patch) | |
| tree | a0793f42f4e1d9269dba2d08acb5a4a917470ab9 /mysys | |
| parent | 53b4185e5823d784c9f358ac01ec18c5bab7e208 (diff) | |
| parent | c3592ca7b8864a2492d98db4d45a7684e979301d (diff) | |
| download | mariadb-git-3cecb1bab381c256e43f0f095a7a02b115dfc7bc.tar.gz | |
Merge tag 'mariadb-10.0.33' into bb-10.0-galerabb-10.0-sachin-galera
Diffstat (limited to 'mysys')
| -rw-r--r-- | mysys/my_init.c | 1 | ||||
| -rw-r--r-- | mysys/my_new.cc | 10 | ||||
| -rw-r--r-- | mysys/my_winerr.c | 4 |
3 files changed, 13 insertions, 2 deletions
diff --git a/mysys/my_init.c b/mysys/my_init.c index dee41e1202a..a0f8e21322e 100644 --- a/mysys/my_init.c +++ b/mysys/my_init.c @@ -200,7 +200,6 @@ Voluntary context switches %ld, Involuntary context switches %ld\n", _CrtSetReportMode( _CRT_ASSERT, _CRTDBG_MODE_FILE ); _CrtSetReportFile( _CRT_ASSERT, _CRTDBG_FILE_STDERR ); _CrtCheckMemory(); - _CrtDumpMemoryLeaks(); #endif } diff --git a/mysys/my_new.cc b/mysys/my_new.cc index 4266452da43..a401ccff135 100644 --- a/mysys/my_new.cc +++ b/mysys/my_new.cc @@ -47,6 +47,11 @@ void* operator new[](std::size_t sz, const std::nothrow_t&) throw() return (void *) my_malloc (sz ? sz : 1, MYF(0)); } +void operator delete (void *ptr, std::size_t) +{ + my_free(ptr); +} + void operator delete (void *ptr) { my_free(ptr); @@ -57,6 +62,11 @@ void operator delete[] (void *ptr) throw () my_free(ptr); } +void operator delete[] (void *ptr, std::size_t) throw () +{ + my_free(ptr); +} + void operator delete(void* ptr, const std::nothrow_t&) throw() { my_free(ptr); diff --git a/mysys/my_winerr.c b/mysys/my_winerr.c index 15f52dd7f37..9577db09eaf 100644 --- a/mysys/my_winerr.c +++ b/mysys/my_winerr.c @@ -75,7 +75,9 @@ static struct errentry errtable[]= { { ERROR_ALREADY_EXISTS, EEXIST }, /* 183 */ { ERROR_FILENAME_EXCED_RANGE, ENOENT }, /* 206 */ { ERROR_NESTING_NOT_ALLOWED, EAGAIN }, /* 215 */ - { ERROR_NOT_ENOUGH_QUOTA, ENOMEM } /* 1816 */ + { ERROR_FILE_SYSTEM_LIMITATION, EFBIG }, /* 665 */ + { ERROR_NO_SYSTEM_RESOURCES, ENOMEM }, /* 1450 */ + { ERROR_NOT_ENOUGH_QUOTA, ENOMEM } /* 1816 */ }; /* size of the table */ |