andrey Mon Oct 22 10:35:33 2007 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/mysqli mysqli.c
Log:
Make it compile with libmysql 3.23
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/mysqli.c?r1=1.72.2.16.2.20&r2=1.72.2.16.2.21&diff_format=u
Index: php-src/ext/mysqli/mysqli.c
diff -u php-src/ext/mysqli/mysqli.c:1.72.2.16.2.20
php-src/ext/mysqli/mysqli.c:1.72.2.16.2.21
--- php-src/ext/mysqli/mysqli.c:1.72.2.16.2.20 Wed Oct 17 08:19:50 2007
+++ php-src/ext/mysqli/mysqli.c Mon Oct 22 10:35:33 2007
@@ -15,7 +15,7 @@
| Author: Georg Richter <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
- $Id: mysqli.c,v 1.72.2.16.2.20 2007/10/17 08:19:50 tony2001 Exp $
+ $Id: mysqli.c,v 1.72.2.16.2.21 2007/10/22 10:35:33 andrey Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -494,6 +494,12 @@
REGISTER_INI_ENTRIES();
+#if MYSQL_VERSION_ID >= 40000
+ if (mysql_server_init(0, NULL, NULL)) {
+ return FAILURE;
+ }
+#endif
+
memcpy(&mysqli_object_handlers, zend_get_std_object_handlers(),
sizeof(zend_object_handlers));
mysqli_object_handlers.clone_obj = NULL;
mysqli_object_handlers.read_property = mysqli_read_property;
@@ -651,10 +657,6 @@
REGISTER_LONG_CONSTANT("MYSQLI_REPORT_ALL", MYSQLI_REPORT_ALL, CONST_CS
| CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("MYSQLI_REPORT_OFF", 0, CONST_CS |
CONST_PERSISTENT);
- if (mysql_server_init(0, NULL, NULL)) {
- return FAILURE;
- }
-
return SUCCESS;
}
/* }}} */
@@ -663,6 +665,7 @@
*/
PHP_MSHUTDOWN_FUNCTION(mysqli)
{
+#if MYSQL_VERSION_ID >= 40000
#ifdef PHP_WIN32
unsigned long client_ver = mysql_get_client_version();
/* Can't call mysql_server_end() multiple times prior to 5.0.42 on
Windows */
@@ -672,6 +675,7 @@
#else
mysql_server_end();
#endif
+#endif
zend_hash_destroy(&mysqli_driver_properties);
zend_hash_destroy(&mysqli_result_properties);
@@ -689,7 +693,7 @@
*/
PHP_RINIT_FUNCTION(mysqli)
{
-#ifdef ZTS
+#ifdef ZTS && MYSQL_VERSION_ID >= 40000
if (mysql_thread_init()) {
return FAILURE;
}
@@ -705,7 +709,7 @@
*/
PHP_RSHUTDOWN_FUNCTION(mysqli)
{
-#ifdef ZTS
+#ifdef ZTS && MYSQL_VERSION_ID >= 40000
mysql_thread_end();
#endif
if (MyG(error_msg)) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
