revert

diff --git a/ext/mysql/php_mysql.c b/ext/mysql/php_mysql.c
index 9065135e44dc53443433698ea08a6d6cce6b9ac5..df10b6d9b73e4fd2b8073c1b36429aa7fa71a648 100644 (file)
--- a/ext/mysql/php_mysql.c
+++ b/ext/mysql/php_mysql.c
@@ -486,9 +486,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
        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;
@@ -672,11 +669,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);
                        }
@@ -783,12 +775,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);
                }