diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-02-17 19:39:05 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-02-17 19:39:05 +0200 |
| commit | 94b45787045677c106a25ebb5aaf1273040b2ff6 (patch) | |
| tree | 4231461f1f43bc3dd1335c7f7738cd85d2957621 /libmysqld | |
| parent | 66b8edf8a57c106b15ef1de2b25ce3e992540b71 (diff) | |
| parent | 16388f393c63b3e2158db1efec8dd9625a0a295e (diff) | |
| download | mariadb-git-94b45787045677c106a25ebb5aaf1273040b2ff6.tar.gz | |
Merge 10.5 into 10.6
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 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() |