diff options
author | Nikita Popov <nikita.ppv@gmail.com> | 2019-06-12 13:50:48 +0200 |
---|---|---|
committer | Nikita Popov <nikita.ppv@gmail.com> | 2019-06-12 13:50:48 +0200 |
commit | 89df0915299e718bf1bf49aacd1e92adb99d8c41 (patch) | |
tree | ccc77aecd5c82e7bac8326846ac2f6399ad481c7 /ext/mysqlnd/mysqlnd_alloc.c | |
parent | 650e49983949b2957e6d7785c99b13470e89e278 (diff) | |
parent | cc89d260968746f1048029d711f113d2a9688a13 (diff) | |
download | php-git-89df0915299e718bf1bf49aacd1e92adb99d8c41.tar.gz |
Merge branch 'PHP-7.4'
Diffstat (limited to 'ext/mysqlnd/mysqlnd_alloc.c')
-rw-r--r-- | ext/mysqlnd/mysqlnd_alloc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/mysqlnd/mysqlnd_alloc.c b/ext/mysqlnd/mysqlnd_alloc.c index a1471dd557..e4fe274901 100644 --- a/ext/mysqlnd/mysqlnd_alloc.c +++ b/ext/mysqlnd/mysqlnd_alloc.c @@ -155,8 +155,8 @@ static void * _mysqlnd_ecalloc(unsigned int nmemb, size_t size MYSQLND_MEM_D) { void *ret; zend_bool collect_memory_statistics = MYSQLND_G(collect_memory_statistics); - zend_long * threshold = &MYSQLND_G(debug_ecalloc_fail_threshold); #if PHP_DEBUG + zend_long * threshold = &MYSQLND_G(debug_ecalloc_fail_threshold); TRACE_ALLOC_ENTER(mysqlnd_ecalloc_name); { |