diff options
| author | Anatoliy Belsky <ab@php.net> | 2012-12-13 15:05:35 +0100 |
|---|---|---|
| committer | Anatoliy Belsky <ab@php.net> | 2012-12-13 15:05:35 +0100 |
| commit | bef54e53653951bd28e0a2e5a40cfe139033dfd4 (patch) | |
| tree | aa06446d1ad831e61fcc393617590ca2497de12e /ext/mysqlnd/mysqlnd_driver.c | |
| parent | d5c2da57560017c2b4f8951f600d8e6a839568ec (diff) | |
| parent | 0d458ae89f7499da51636140c186970dbfdc06ae (diff) | |
| download | php-git-bef54e53653951bd28e0a2e5a40cfe139033dfd4.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Fixed mysqlnd compilation in debug mode on windows
Diffstat (limited to 'ext/mysqlnd/mysqlnd_driver.c')
| -rw-r--r-- | ext/mysqlnd/mysqlnd_driver.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/ext/mysqlnd/mysqlnd_driver.c b/ext/mysqlnd/mysqlnd_driver.c index 93f3d3fc95..6fab3548f8 100644 --- a/ext/mysqlnd/mysqlnd_driver.c +++ b/ext/mysqlnd/mysqlnd_driver.c @@ -99,7 +99,9 @@ static void mysqlnd_error_list_pdtor(void * pDest) { MYSQLND_ERROR_LIST_ELEMENT * element = (MYSQLND_ERROR_LIST_ELEMENT *) pDest; +#ifdef ZTS TSRMLS_FETCH(); +#endif DBG_ENTER("mysqlnd_error_list_pdtor"); if (element->error) { mnd_pefree(element->error, TRUE); |