summaryrefslogtreecommitdiff
path: root/ext/mysqlnd/mysqlnd_net.c
diff options
context:
space:
mode:
authorAndrey Hristov <andrey.hristov@dnhsoft.com>2016-10-17 19:11:54 +0300
committerAndrey Hristov <andrey.hristov@dnhsoft.com>2016-10-17 19:11:54 +0300
commit7108db3022ccafaef42d82457e7982cd73daa321 (patch)
tree1e17cde44f711781584c98e236a66adb3ab42689 /ext/mysqlnd/mysqlnd_net.c
parent63166412a2d22ddb58ef40a9dd5872d9ac0369be (diff)
parent66d4a2e13fa4702b4feb8d91f414dd0206b14955 (diff)
downloadphp-git-7108db3022ccafaef42d82457e7982cd73daa321.tar.gz
Merge branch 'PHP-7.0' into PHP-7.1
Diffstat (limited to 'ext/mysqlnd/mysqlnd_net.c')
-rw-r--r--ext/mysqlnd/mysqlnd_net.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/ext/mysqlnd/mysqlnd_net.c b/ext/mysqlnd/mysqlnd_net.c
index 111a4898d0..5437409088 100644
--- a/ext/mysqlnd/mysqlnd_net.c
+++ b/ext/mysqlnd/mysqlnd_net.c
@@ -818,13 +818,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;