mirror of
https://github.com/php/php-src.git
synced 2024-09-23 19:07:26 +00:00
revert
This commit is contained in:
parent
855446cd42
commit
5e5dbfa35e
@ -481,9 +481,6 @@ static void php_mysql_do_connect(INTERNAL_FUNCTION_PARAMETERS, int persistent)
|
||||
php_mysql_conn *mysql=NULL;
|
||||
#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 @@ static void php_mysql_do_connect(INTERNAL_FUNCTION_PARAMETERS, int persistent)
|
||||
#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 @@ static void php_mysql_do_connect(INTERNAL_FUNCTION_PARAMETERS, int persistent)
|
||||
#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);
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user