summaryrefslogtreecommitdiff
path: root/libmysqld
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2021-02-17 16:19:49 +0200
committerMarko Mäkelä <marko.makela@mariadb.com>2021-02-17 16:19:49 +0200
commit16388f393c63b3e2158db1efec8dd9625a0a295e (patch)
treef557b2818d4918582fb9a4cd61819e75c311ecc7 /libmysqld
parentd82386b6b97b0c84094f3d1bbb0a73dbfb5113b6 (diff)
parent9d7dc1f6d0494d8c408f2c3e51a214e364783346 (diff)
downloadmariadb-git-16388f393c63b3e2158db1efec8dd9625a0a295e.tar.gz
Merge mariadb-10.5.9
Diffstat (limited to 'libmysqld')
-rw-r--r--libmysqld/lib_sql.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/libmysqld/lib_sql.cc b/libmysqld/lib_sql.cc
index 9cc6520faf5..c6493773db0 100644
--- a/libmysqld/lib_sql.cc
+++ b/libmysqld/lib_sql.cc
@@ -625,7 +625,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()