summaryrefslogtreecommitdiff
path: root/ext/mysqlnd/mysqlnd.c
diff options
context:
space:
mode:
authorAndrey Hristov <andrey.hristov@dnhsoft.com>2016-10-17 18:58:14 +0300
committerAndrey Hristov <andrey.hristov@dnhsoft.com>2016-10-17 18:58:14 +0300
commit9594e364ed49d575dc27b887a996af10d18577ce (patch)
tree676d6c067d743ff8f715adfbac15a674bbbbb323 /ext/mysqlnd/mysqlnd.c
parente1f5b6d8dfe1543205d5b45d3dcf1d34f5e2e420 (diff)
downloadphp-git-9594e364ed49d575dc27b887a996af10d18577ce.tar.gz
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.
Diffstat (limited to 'ext/mysqlnd/mysqlnd.c')
-rw-r--r--ext/mysqlnd/mysqlnd.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/ext/mysqlnd/mysqlnd.c b/ext/mysqlnd/mysqlnd.c
index 4c8f27f70c..4290f9edaa 100644
--- 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: