diff options
| author | Monty <monty@mariadb.org> | 2020-07-03 20:26:09 +0300 |
|---|---|---|
| committer | Monty <monty@mariadb.org> | 2020-07-03 20:26:09 +0300 |
| commit | e9f06b19e09319d11c346943871254aaf755af24 (patch) | |
| tree | 0e9317a1f881e8b8dd9794015b81c269a7be3b74 /libmysqld | |
| parent | 1bf863a91a8ad8cd6ba8e50db34b302120feaa29 (diff) | |
| parent | 484931325e7bcecddc6daf1a55c008ddd67497e4 (diff) | |
| download | mariadb-git-e9f06b19e09319d11c346943871254aaf755af24.tar.gz | |
Merge remote-tracking branch 'origin/10.3' into 10.4
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 243a451bbda..52e6a08d2f8 100644 --- a/libmysqld/libmysql.c +++ b/libmysqld/libmysql.c @@ -1141,6 +1141,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; |