diff options
| author | Andrey Hristov <andrey@php.net> | 2008-02-14 15:20:08 +0000 |
|---|---|---|
| committer | Andrey Hristov <andrey@php.net> | 2008-02-14 15:20:08 +0000 |
| commit | 62e8d0f5aaeacbf55b75adee1cb888df27a54e01 (patch) | |
| tree | 30c6722f604f6db5f871e048c4637ae6817ea870 /ext/mysqlnd/php_mysqlnd.c | |
| parent | 91b568e65d8b6f3126147afa5168eae24008e5e3 (diff) | |
| download | php-git-62e8d0f5aaeacbf55b75adee1cb888df27a54e01.tar.gz | |
Another fix
Diffstat (limited to 'ext/mysqlnd/php_mysqlnd.c')
| -rw-r--r-- | ext/mysqlnd/php_mysqlnd.c | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/ext/mysqlnd/php_mysqlnd.c b/ext/mysqlnd/php_mysqlnd.c index a4b7b4f30d..9065bbc68d 100644 --- a/ext/mysqlnd/php_mysqlnd.c +++ b/ext/mysqlnd/php_mysqlnd.c @@ -178,11 +178,12 @@ static PHP_MSHUTDOWN_FUNCTION(mysqlnd) /* }}} */ -#ifdef PHP_DEBUG +#if defined(PHP_DEBUG) || defined(MYSQLND_THREADED) /* {{{ PHP_RINIT_FUNCTION */ static PHP_RINIT_FUNCTION(mysqlnd) { +#if defined(PHP_DEBUG) if (MYSQLND_G(debug)) { MYSQLND_DEBUG *dbg = mysqlnd_debug_init(TSRMLS_C); if (!dbg) { @@ -190,8 +191,11 @@ static PHP_RINIT_FUNCTION(mysqlnd) } dbg->m->set_mode(dbg, MYSQLND_G(debug)); MYSQLND_G(dbg) = dbg; - MYSQLND_G(thread_id) = tsrm_thread_id(); } +#endif +#ifdef MYSQLND_THREADED + MYSQLND_G(thread_id) = tsrm_thread_id(); +#endif return SUCCESS; } /* }}} */ @@ -222,11 +226,14 @@ zend_module_entry mysqlnd_module_entry = { mysqlnd_functions, PHP_MINIT(mysqlnd), PHP_MSHUTDOWN(mysqlnd), -#ifdef PHP_DEBUG +#ifdef PHP_DEBUG || defined(MYSQLND_THREADED) PHP_RINIT(mysqlnd), - PHP_RSHUTDOWN(mysqlnd), #else NULL, +#endif +#ifdef PHP_DEBUG + PHP_RSHUTDOWN(mysqlnd), +#else NULL, #endif PHP_MINFO(mysqlnd), |