diff options
| author | Antony Dovgal <tony2001@php.net> | 2007-04-23 09:32:36 +0000 |
|---|---|---|
| committer | Antony Dovgal <tony2001@php.net> | 2007-04-23 09:32:36 +0000 |
| commit | 5e5dbfa35e4dcfce5090616feaab5dcabe0c87f5 (patch) | |
| tree | 2344eaaae697e78b136ac9d8d151d7345a3083f2 | |
| parent | 855446cd42321cd9ea7dc633a79707eccb738cdb (diff) | |
| download | php-git-5e5dbfa35e4dcfce5090616feaab5dcabe0c87f5.tar.gz | |
revert
| -rw-r--r-- | ext/mysql/php_mysql.c | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/ext/mysql/php_mysql.c b/ext/mysql/php_mysql.c index f7791f2ece..131f9da8d5 100644 --- a/ext/mysql/php_mysql.c +++ b/ext/mysql/php_mysql.c @@ -482,9 +482,6 @@ static void php_mysql_do_connect(INTERNAL_FUNCTION_PARAMETERS, int persistent) #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); } |