fix #41083 (mysql_ping() requires MYSQL_OPT_RECONNECT to be set since MySQL 5.0.13)

diff --git a/ext/mysql/php_mysql.c b/ext/mysql/php_mysql.c
index 636e80ef1b6e36c53a29500b9a503eca43995d39..f7791f2ece69ffda4923acd6fb178981a11e6d5c 100644 (file)
--- a/ext/mysql/php_mysql.c
+++ b/ext/mysql/php_mysql.c
@@ -481,6 +481,9 @@ 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;
@@ -590,8 +593,14 @@ 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 (connect_timeout != -1)
+#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);
+                       }
 
                        if (mysql_real_connect(&mysql->conn, host, user, passwd, NULL, port, socket, client_flags)==NULL) {
 #else
@@ -707,8 +716,15 @@ 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 (connect_timeout != -1)
-                               mysql_options(&mysql->conn, MYSQL_OPT_CONNECT_TIMEOUT, (const char *)&connect_timeout);
+#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);
+               }
 
                if (mysql_real_connect(&mysql->conn, host, user, passwd, NULL, port, socket, client_flags)==NULL) {
 #else