cvs: php-src(PHP_5_2) /ext/mysql php_mysql.c

tony2001 Mon Apr 23 09:32:44 2007 UTC Modified files: (Branch: PHP_5_2) /php-src/ext/mysql php_mysql.c Log: revert http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/php_mysql.c?r1=1.213.2.6.2.9&r2=1.213.2.6.2.10&diff_format=u Index: php-src/ext/mysql/php_mysql.c diff -u php-src/ext/mysql/php_mysql.c:1.213.2.6.2.9 php-src/ext/mysql/php_mysql.c:1.213.2.6.2.10 --- php-src/ext/mysql/php_mysql.c:1.213.2.6.2.9 Sun Apr 22 15:19:08 2007 +++ php-src/ext/mysql/php_mysql.c Mon Apr 23 09:32:44 2007 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_mysql.c,v 1.213.2.6.2.9 2007/04/22 15:19:08 iliaa Exp $ */ +/* $Id: php_mysql.c,v 1.213.2.6.2.10 2007/04/23 09:32:44 tony2001 Exp $ */ /* TODO: * @@ -487,9 +487,6 @@ #if MYSQL_VERSION_ID <= 32230 void (*handler) (int); #endif -#if MYSQL_VERSION_ID > 50012 - my_bool my_true = 1; -#endif zval **z_host=NULL, **z_user=NULL, **z_passwd=NULL, **z_new_link=NULL, **z_client_flags=NULL; zend_bool free_host=0, new_link=0; long connect_timeout; @@ -672,11 +669,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); } @@ -783,12 +775,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); }