diff options
author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-02-11 09:07:06 +0200 |
---|---|---|
committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-02-11 09:07:06 +0200 |
commit | 5ae70dbd877e22b47d7c3d238e150e13eb794273 (patch) | |
tree | 6ba2e71fb2cbf157360fb490e294bd249d93b91e /libmysqld/lib_sql.cc | |
parent | f45327d42961fa4589f652af1916be4c8d6c82fd (diff) | |
parent | ca28086d42df904f11d129fd3df57177a4f61979 (diff) | |
download | mariadb-git-10.6-MDEV-20612-3-MDEV-23328.tar.gz |
Merge bb-10.5-release10.6-MDEV-20612-3-MDEV-23328
FIXME: Many Galera tests hang
Diffstat (limited to 'libmysqld/lib_sql.cc')
-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 b1a467db3c6..dfff28e8903 100644 --- a/libmysqld/lib_sql.cc +++ b/libmysqld/lib_sql.cc @@ -624,7 +624,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() |