diff options
| author | Andrey Hristov <andrey.hristov@dnhsoft.com> | 2016-10-17 19:01:12 +0300 |
|---|---|---|
| committer | Andrey Hristov <andrey.hristov@dnhsoft.com> | 2016-10-17 19:01:12 +0300 |
| commit | 66d4a2e13fa4702b4feb8d91f414dd0206b14955 (patch) | |
| tree | 33e1ebd4d2b3be139b6dcd69732bd0c66a4ea58a /ext/mysqlnd/mysqlnd_net.c | |
| parent | 96ed946b2b0301489419d1b0321f9a94e35b3abc (diff) | |
| parent | 9594e364ed49d575dc27b887a996af10d18577ce (diff) | |
| download | php-git-66d4a2e13fa4702b4feb8d91f414dd0206b14955.tar.gz | |
Merge branch 'PHP-5.6' into PHP-7.0
Diffstat (limited to 'ext/mysqlnd/mysqlnd_net.c')
| -rw-r--r-- | ext/mysqlnd/mysqlnd_net.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ext/mysqlnd/mysqlnd_net.c b/ext/mysqlnd/mysqlnd_net.c index 56c9d30df1..5406533631 100644 --- a/ext/mysqlnd/mysqlnd_net.c +++ b/ext/mysqlnd/mysqlnd_net.c @@ -827,13 +827,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; |