database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

Merge branch '10.5' into 10.6

Browse Source
This commit is contained in:
Oleksandr Byelkin
2023-11-08 15:57:05 +01:00
parent 2a4c573339 6cfd2ba397
commit b83c379420
381 changed files with 10233 additions and 5782 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
sql/threadpool_common.cc
View File

@@ -133,12 +133,17 @@ static void re_init_net_server_extension(THD *thd)
#endif /* HAVE_PSI_INTERFACE */
static inline bool has_unread_compressed_data(const NET *net)
{
return net->compress && net->remain_in_buf;
}
static inline void set_thd_idle(THD *thd)
{
thd->net.reading_or_writing= 1;
#ifdef HAVE_PSI_INTERFACE
net_before_header_psi(&thd->net, thd, 0);
if (!has_unread_compressed_data(&thd->net))
net_before_header_psi(&thd->net, thd, 0);
#endif
}
@@ -381,10 +386,8 @@ static void handle_wait_timeout(THD *thd)
static bool has_unread_data(THD* thd)
{
NET *net= &thd->net;
if (net->compress && net->remain_in_buf)
return true;
Vio *vio= net->vio;
return vio->has_data(vio);
return vio->has_data(vio) || has_unread_compressed_data(net);
}