tony2001 Mon Apr 23 09:32:36 2007 UTC Modified files: /php-src/ext/mysql php_mysql.c Log: revert http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/php_mysql.c?r1=1.232&r2=1.233&diff_format=u Index: php-src/ext/mysql/php_mysql.c diff -u php-src/ext/mysql/php_mysql.c:1.232 php-src/ext/mysql/php_mysql.c:1.233 --- php-src/ext/mysql/php_mysql.c:1.232 Sat Apr 14 10:19:10 2007 +++ php-src/ext/mysql/php_mysql.c Mon Apr 23 09:32:36 2007 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_mysql.c,v 1.232 2007/04/14 10:19:10 tony2001 Exp $ */ +/* $Id: php_mysql.c,v 1.233 2007/04/23 09:32:36 tony2001 Exp $ */ /* TODO: * @@ -482,9 +482,6 @@ #if MYSQL_VERSION_ID <= 32230 void (*handler) (int); #endif -#if MYSQL_VERSION_ID > 50012 - my_bool my_true = 1; -#endif zend_bool free_host=0, new_link=0; long connect_timeout; @@ -593,11 +590,6 @@ #if MYSQL_VERSION_ID > 32199 /* this lets us set the port number */ mysql_init(&mysql->conn); -#if MYSQL_VERSION_ID > 50012 - /* Reconnect has been off by default since MySQL 5.0.3; - this option is new in 5.0.13 and provides a way to set reconnection behavior explicitly. */ - mysql_options(&mysql->conn, MYSQL_OPT_RECONNECT, (const char *)&my_true); -#endif if (connect_timeout != -1) { mysql_options(&mysql->conn, MYSQL_OPT_CONNECT_TIMEOUT, (const char *)&connect_timeout); } @@ -716,12 +708,6 @@ #if MYSQL_VERSION_ID > 32199 /* this lets us set the port number */ mysql_init(&mysql->conn); -#if MYSQL_VERSION_ID > 50012 - /* Reconnect has been off by default since MySQL 5.0.3; - this option is new in 5.0.13 and provides a way to set reconnection behavior explicitly. */ - mysql_options(&mysql->conn, MYSQL_OPT_RECONNECT, (const char *)&my_true); -#endif - if (connect_timeout != -1) { mysql_options(&mysql->conn, MYSQL_OPT_CONNECT_TIMEOUT, (const char *)&connect_timeout); }
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php