andrey Wed Sep 12 09:12:56 2007 UTC Modified files: (Branch: PHP_5_2) /php-src NEWS /php-src/ext/mysqli mysqli.c php_mysqli.h Log: Fix stupid error, which happens only on Windows. And we thought this has been fixed. Now my_thread_end() should be called and there should be no warnings in the error logs of exiting thread, which hasn't deinited, and leaks. http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.941&r2=1.2027.2.547.2.942&diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.941 php-src/NEWS:1.2027.2.547.2.942 --- php-src/NEWS:1.2027.2.547.2.941 Tue Sep 11 21:03:47 2007 +++ php-src/NEWS Wed Sep 12 09:12:55 2007 @@ -1,6 +1,8 @@ PHP NEWS ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| ?? ??? 20??, PHP 5.2.5 +- Fixed missing brackets leading to build warning and error in the log. + Win32 code). (Andrey) - Fixed leaks with mulitple connects on one mysqli object. (Andrey) - Fixed endianness detection on MacOS when building universal binary. (Uwe Schindler, Christian Speich, Tony) http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/mysqli.c?r1=1.72.2.16.2.16&r2=1.72.2.16.2.17&diff_format=u Index: php-src/ext/mysqli/mysqli.c diff -u php-src/ext/mysqli/mysqli.c:1.72.2.16.2.16 php-src/ext/mysqli/mysqli.c:1.72.2.16.2.17 --- php-src/ext/mysqli/mysqli.c:1.72.2.16.2.16 Mon Jun 25 16:01:30 2007 +++ php-src/ext/mysqli/mysqli.c Wed Sep 12 09:12:56 2007 @@ -15,7 +15,7 @@ | Author: Georg Richter <[EMAIL PROTECTED]> | +----------------------------------------------------------------------+ - $Id: mysqli.c,v 1.72.2.16.2.16 2007/06/25 16:01:30 scottmac Exp $ + $Id: mysqli.c,v 1.72.2.16.2.17 2007/09/12 09:12:56 andrey Exp $ */ #ifdef HAVE_CONFIG_H @@ -665,7 +665,7 @@ PHP_MSHUTDOWN_FUNCTION(mysqli) { #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(); http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/php_mysqli.h?r1=1.54.2.7.2.5&r2=1.54.2.7.2.6&diff_format=u Index: php-src/ext/mysqli/php_mysqli.h diff -u php-src/ext/mysqli/php_mysqli.h:1.54.2.7.2.5 php-src/ext/mysqli/php_mysqli.h:1.54.2.7.2.6 --- php-src/ext/mysqli/php_mysqli.h:1.54.2.7.2.5 Sat Feb 24 14:33:50 2007 +++ php-src/ext/mysqli/php_mysqli.h Wed Sep 12 09:12:56 2007 @@ -15,7 +15,7 @@ | Author: Georg Richter <[EMAIL PROTECTED]> | +----------------------------------------------------------------------+ - $Id: php_mysqli.h,v 1.54.2.7.2.5 2007/02/24 14:33:50 helly Exp $ + $Id: php_mysqli.h,v 1.54.2.7.2.6 2007/09/12 09:12:56 andrey Exp $ */ /* A little hack to prevent build break, when mysql is used together with @@ -241,9 +241,10 @@ #define MYSQLI_RETURN_LONG_LONG(__val) \ { \ if ((__val) < LONG_MAX) { \ - RETURN_LONG((__val)); \ + RETURN_LONG((long) (__val)); \ } else { \ char *ret; \ + /* always used with my_ulonglong -> %llu */ \ int l = spprintf(&ret, 0, "%llu", (__val)); \ RETURN_STRINGL(ret, l, 0); \ } \
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php