diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2021-01-18 18:01:17 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2021-01-24 11:35:55 +0100 |
| commit | 990eb09333dcb2147ccffa9633c1b2bd246aea65 (patch) | |
| tree | c5e64a7c8699cd18540aa7c0efff40fd713f3b41 /libmysqld | |
| parent | 4a7e62296a295758b128d20f6bbb0973b94c5193 (diff) | |
| download | mariadb-git-990eb09333dcb2147ccffa9633c1b2bd246aea65.tar.gz | |
cleanup: fix and generalize handle_manager thread
* provide an argument to the callback
* don't ignore a callback request if it's already present in the queue
* initialize mutex/cond/in_use flag before starting the thread,
in case the first callback queueing request arrives before
handle_manager had time to initialize
* set/check abort_manager under a mutex, otherwise handle_manager
thread might destroy LOCK_manager before stop_handle_manager
released it
* signal COND on queueing a callback, stop cond_wait on callback request
* always start the thread, even if flush_time is 0
* but keep the old behavior in embedded (no replication, no galera)
* style cleanups (e.g. remove volatile for a variable protected by a mutex)
Diffstat (limited to 'libmysqld')
| -rw-r--r-- | libmysqld/lib_sql.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libmysqld/lib_sql.cc b/libmysqld/lib_sql.cc index 229e4e69e6a..ddb3f2c71aa 100644 --- a/libmysqld/lib_sql.cc +++ b/libmysqld/lib_sql.cc @@ -623,7 +623,8 @@ int init_embedded_server(int argc, char **argv, char **groups) (void) thr_setconcurrency(concurrency); // 10 by default - start_handle_manager(); + if (flush_time && flush_time != ~(ulong) 0L) + start_handle_manager(); // FIXME initialize binlog_filter and rpl_filter if not already done // corresponding delete is in clean_up() |