diff options
author | Oleksandr Byelkin <sanja@mariadb.com> | 2021-02-02 17:55:53 +0100 |
---|---|---|
committer | Oleksandr Byelkin <sanja@mariadb.com> | 2021-02-02 17:55:53 +0100 |
commit | 0f810b58faf487c7cd59f2ee520f62deb0f712eb (patch) | |
tree | dfb52d41ffd83d0dbffb969c091fe190b9457a24 /libmysqld/lib_sql.cc | |
parent | 542d769ea1a22a7a6a87c9fe76ff911a162ade44 (diff) | |
parent | 251b52190070095e4c65ffb0ae545d49330a02b2 (diff) | |
download | mariadb-git-10.4-merge-attempt.tar.gz |
Merge branch 'bb-10.3-release' into bb-10.4-release10.4-merge-attempt
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 9fd6eb7805a..42a93f9a38b 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() |