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:
Sergei Golubchik
2024-05-08 20:06:00 +02:00
parent 30d3cfad69 29c185bd77
commit 7b53672c63
360 changed files with 9013 additions and 2214 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sql/threadpool_generic.cc
View File

@@ -107,7 +107,7 @@ struct pool_timer_t
mysql_cond_t cond;
volatile uint64 current_microtime;
std::atomic<uint64_t> next_timeout_check;
int tick_interval;
uint tick_interval;
bool shutdown;
pthread_t timer_thread_id;
};
@@ -569,7 +569,7 @@ static void* timer_thread(void *param)
struct timespec ts;
int err;
set_timespec_nsec(ts,timer->tick_interval*1000000);
set_timespec_nsec(ts, timer->tick_interval*1000000LL);
mysql_mutex_lock(&timer->mutex);
err= mysql_cond_timedwait(&timer->cond, &timer->mutex, &ts);
if (timer->shutdown)