cvs: php-src(PHP_5_2) / NEWS /ext/mysqli mysqli_nonapi.c

tony2001 Mon Apr 23 09:27:07 2007 UTC Modified files: (Branch: PHP_5_2) /php-src/ext/mysqli mysqli_nonapi.c /php-src NEWS Log: revert http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/mysqli_nonapi.c?r1=1.54.2.7.2.3&r2=1.54.2.7.2.4&diff_format=u Index: php-src/ext/mysqli/mysqli_nonapi.c diff -u php-src/ext/mysqli/mysqli_nonapi.c:1.54.2.7.2.3 php-src/ext/mysqli/mysqli_nonapi.c:1.54.2.7.2.4 --- php-src/ext/mysqli/mysqli_nonapi.c:1.54.2.7.2.3 Sat Apr 14 10:35:05 2007 +++ php-src/ext/mysqli/mysqli_nonapi.c Mon Apr 23 09:27:07 2007 @@ -15,7 +15,7 @@ | Author: Georg Richter <georg@php.net> | +----------------------------------------------------------------------+ - $Id: mysqli_nonapi.c,v 1.54.2.7.2.3 2007/04/14 10:35:05 tony2001 Exp $ + $Id: mysqli_nonapi.c,v 1.54.2.7.2.4 2007/04/23 09:27:07 tony2001 Exp $ */ #ifdef HAVE_CONFIG_H @@ -39,9 +39,6 @@ char *hostname = NULL, *username=NULL, *passwd=NULL, *dbname=NULL, *socket=NULL; unsigned int hostname_len = 0, username_len = 0, passwd_len = 0, dbname_len = 0, socket_len = 0; long port=0; -#if MYSQL_VERSION_ID > 50012 - my_bool my_true = 1; -#endif if (getThis() && !ZEND_NUM_ARGS()) { RETURN_NULL(); @@ -87,10 +84,6 @@ } #endif -#if MYSQL_VERSION_ID > 50012 - mysql_options(mysql->mysql, MYSQL_OPT_RECONNECT, (const char *)&my_true); -#endif - if (!socket) { socket = MyG(default_socket); } http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.658&r2=1.2027.2.547.2.659&diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.658 php-src/NEWS:1.2027.2.547.2.659 --- php-src/NEWS:1.2027.2.547.2.658 Sun Apr 22 21:33:32 2007 +++ php-src/NEWS Mon Apr 23 09:27:07 2007 @@ -12,8 +12,6 @@ - Fixed bug #41109 (recursiveiterator.inc says "implements" Iterator instead of "extends"). (Marcus) - Fixed bug #41093 (magic_quotes_gpc ignores first arrays keys). (Arpad, Ilia) -- Fixed bug #41083 (mysql_ping() requires MYSQL_OPT_RECONNECT to be set since - MySQL 5.0.13). (xiaojb at gmail dot com, Tony) - Fixed bug #41075 (memleak when creating default object caused exception). (Dmitry) - Fixed bug #41067 (json_encode() problem with UTF-16 input). (jp at df5ea