diff options
author | Vladislav Vaintroub <wlad@mariadb.com> | 2020-07-26 22:16:55 +0200 |
---|---|---|
committer | Vladislav Vaintroub <wlad@mariadb.com> | 2020-07-28 21:24:55 +0200 |
commit | 51cd130eeabe1fa5886ba33f68b0f9cb54dec518 (patch) | |
tree | 837a560066e478511f06ef6b2ad380d117188c6e /sql/net_serv.cc | |
parent | 56990b18d914b8150c9f777d134724d2b3390360 (diff) | |
download | mariadb-git-10.6-wlad.tar.gz |
WIP10.6-wlad
Diffstat (limited to 'sql/net_serv.cc')
-rw-r--r-- | sql/net_serv.cc | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/sql/net_serv.cc b/sql/net_serv.cc index 3e173a47f02..59f77beafeb 100644 --- a/sql/net_serv.cc +++ b/sql/net_serv.cc @@ -627,8 +627,13 @@ net_real_write(NET *net,const uchar *packet, size_t len) my_bool net_blocking = vio_is_blocking(net->vio); DBUG_ENTER("net_real_write"); -#if defined(MYSQL_SERVER) && defined(USE_QUERY_CACHE) - query_cache_insert(net->thd, (char*) packet, len, net->pkt_nr); +#if defined(MYSQL_SERVER) + THD *thd= (THD *)net->thd; +#if defined(USE_QUERY_CACHE) + query_cache_insert(thd, (char*) packet, len, net->pkt_nr); +#endif + if (likely(thd)) + thd->async_state.wait_for_pending_ops(); #endif if (unlikely(net->error == 2)) |