diff options
| author | Scott MacVicar <scottmac@php.net> | 2007-09-09 16:08:17 +0000 |
|---|---|---|
| committer | Scott MacVicar <scottmac@php.net> | 2007-09-09 16:08:17 +0000 |
| commit | 734dfc8b753e5785e3d0654d297f8a508444cd21 (patch) | |
| tree | 618c9ea9ae60f51ceb1c4eb9945cbe4d4ded3d44 /ext/mysql/php_mysql.c | |
| parent | 374bef4bc41a75b8f774a73316b2faa8c27dcaf7 (diff) | |
| download | php-git-734dfc8b753e5785e3d0654d297f8a508444cd21.tar.gz | |
MFH: Fixed bug 42549 (ext/mysql failed to compile with libmysql 3.23)
Diffstat (limited to 'ext/mysql/php_mysql.c')
| -rw-r--r-- | ext/mysql/php_mysql.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/ext/mysql/php_mysql.c b/ext/mysql/php_mysql.c index 0e8f3caa4d..50439d94da 100644 --- a/ext/mysql/php_mysql.c +++ b/ext/mysql/php_mysql.c @@ -401,9 +401,11 @@ ZEND_MODULE_STARTUP_D(mysql) REGISTER_LONG_CONSTANT("MYSQL_CLIENT_INTERACTIVE", CLIENT_INTERACTIVE, CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT("MYSQL_CLIENT_IGNORE_SPACE", CLIENT_IGNORE_SPACE, CONST_CS | CONST_PERSISTENT); +#if MYSQL_VERSION_ID >= 40000 if (mysql_server_init(0, NULL, NULL)) { return FAILURE; } +#endif return SUCCESS; } @@ -413,8 +415,9 @@ ZEND_MODULE_STARTUP_D(mysql) */ PHP_MSHUTDOWN_FUNCTION(mysql) { +#if MYSQL_VERSION_ID >= 40000 #ifdef PHP_WIN32 - unsigned long client_ver = mysql_get_client_version; + unsigned long client_ver = mysql_get_client_version(); /* Can't call mysql_server_end() multiple times prior to 5.0.42 on Windows */ if ((client_ver > 50042 && client_ver < 50100) || client_ver > 50122) { mysql_server_end(); @@ -422,6 +425,7 @@ PHP_MSHUTDOWN_FUNCTION(mysql) #else mysql_server_end(); #endif +#endif UNREGISTER_INI_ENTRIES(); return SUCCESS; @@ -432,7 +436,7 @@ PHP_MSHUTDOWN_FUNCTION(mysql) */ PHP_RINIT_FUNCTION(mysql) { -#ifdef ZTS +#if defined(ZTS) && MYSQL_VERSION_ID >= 40000 if (mysql_thread_init()) { return FAILURE; } @@ -452,7 +456,7 @@ PHP_RINIT_FUNCTION(mysql) */ PHP_RSHUTDOWN_FUNCTION(mysql) { -#ifdef ZTS +#if defined(ZTS) && MYSQL_VERSION_ID >= 40000 mysql_thread_end(); #endif |