diff options
| author | Monty <monty@mariadb.org> | 2020-07-03 23:31:12 +0300 |
|---|---|---|
| committer | Monty <monty@mariadb.org> | 2020-07-03 23:31:12 +0300 |
| commit | 0fd89a1a89da73cec8e87e1f007637eaec51dcc0 (patch) | |
| tree | 2198830733091087ae4d342d56c93540698ec325 /libmysqld | |
| parent | 70684afef2ce6d797f78db192c4472260cd22660 (diff) | |
| parent | e9f06b19e09319d11c346943871254aaf755af24 (diff) | |
| download | mariadb-git-0fd89a1a89da73cec8e87e1f007637eaec51dcc0.tar.gz | |
Merge remote-tracking branch 'origin/10.4' into 10.5
Diffstat (limited to 'libmysqld')
| -rw-r--r-- | libmysqld/libmysql.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libmysqld/libmysql.c b/libmysqld/libmysql.c index 8b48d6d4bcb..e269840d674 100644 --- a/libmysqld/libmysql.c +++ b/libmysqld/libmysql.c @@ -1164,6 +1164,7 @@ my_bool STDCALL mysql_embedded(void) void my_net_local_init(NET *net) { net->max_packet= (uint) net_buffer_length; + net->read_timeout= net->write_timeout= 0; my_net_set_read_timeout(net, CLIENT_NET_READ_TIMEOUT); my_net_set_write_timeout(net, CLIENT_NET_WRITE_TIMEOUT); net->retry_count= 1; |