This is a very very old thing dated back to year 2009.

MYSQL_OPT_READ_TIMEOUT was never a macro in mysqlnd but an enum value.
So this never actually worked correctly. mysqlnd provides these so it is
safe to have them when mysqlnd used.

diff --git a/ext/mysqli/mysqli_api.c b/ext/mysqli/mysqli_api.c
index 4f66069e4182d34b50c6fe36984b890ebb5acc6c..b8068201b1e07797c8e45ed42ed7e697b4c4b8f9 100644 (file)
--- a/ext/mysqli/mysqli_api.c
+++ b/ext/mysqli/mysqli_api.c
@@ -1759,14 +1759,14 @@ static int mysqli_options_get_option_zval_type(int option)
 #ifdef MYSQL_OPT_PROTOCOL
                 case MYSQL_OPT_PROTOCOL:
 #endif /* MySQL 4.1.0 */
-#ifdef MYSQL_OPT_READ_TIMEOUT
+#if MYSQL_VERSION_ID > 40101 || defined(MYSQLI_USE_MYSQLND)
                case MYSQL_OPT_READ_TIMEOUT:
                case MYSQL_OPT_WRITE_TIMEOUT:
                case MYSQL_OPT_GUESS_CONNECTION:
                case MYSQL_OPT_USE_EMBEDDED_CONNECTION:
                case MYSQL_OPT_USE_REMOTE_CONNECTION:
                case MYSQL_SECURE_AUTH:
-#endif /* MySQL 4.1.1 */
+#endif
 #ifdef MYSQL_OPT_RECONNECT
                case MYSQL_OPT_RECONNECT:
 #endif /* MySQL 5.0.13 */

diff --git a/ext/mysqlnd/mysqlnd.c b/ext/mysqlnd/mysqlnd.c
index 4c8f27f70c5074f4997870d2b85f6469e2c28334..4290f9edaa392bb4a02d2ce32793532ed17c941a 100644 (file)
--- a/ext/mysqlnd/mysqlnd.c
+++ b/ext/mysqlnd/mysqlnd.c
@@ -2333,10 +2333,8 @@ MYSQLND_METHOD(mysqlnd_conn_data, set_client_option)(MYSQLND_CONN_DATA * const c
        }
        switch (option) {
                case MYSQL_OPT_COMPRESS:
-#ifdef WHEN_SUPPORTED_BY_MYSQLI
                case MYSQL_OPT_READ_TIMEOUT:
                case MYSQL_OPT_WRITE_TIMEOUT:
-#endif
                case MYSQLND_OPT_SSL_KEY:
                case MYSQLND_OPT_SSL_CERT:
                case MYSQLND_OPT_SSL_CA:

diff --git a/ext/mysqlnd/mysqlnd_net.c b/ext/mysqlnd/mysqlnd_net.c
index 0fa67107e67210fc123b2c34e0738eacc3d5dbeb..8ede6424b9f14c56402460bfe6c576dcaaabb3cb 100644 (file)
--- a/ext/mysqlnd/mysqlnd_net.c
+++ b/ext/mysqlnd/mysqlnd_net.c
@@ -820,13 +820,13 @@ MYSQLND_METHOD(mysqlnd_net, set_client_option)(MYSQLND_NET * const net, enum mys
                        break;
                }
                case MYSQL_OPT_READ_TIMEOUT:
+                       DBG_INF("MYSQL_OPT_READ_TIMEOUT");
                        net->data->options.timeout_read = *(unsigned int*) value;
                        break;
-#ifdef WHEN_SUPPORTED_BY_MYSQLI
                case MYSQL_OPT_WRITE_TIMEOUT:
+                       DBG_INF("MYSQL_OPT_WRITE_TIMEOUT");
                        net->data->options.timeout_write = *(unsigned int*) value;
                        break;
-#endif
                case MYSQL_OPT_COMPRESS:
                        net->data->options.flags |= MYSQLND_NET_FLAG_USE_COMPRESSION;
                        break;