diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-12-02 21:46:01 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-12-02 21:46:01 +0200 |
| commit | 4174fc1a1bd1f1c29f10264108269bf2e18e2f24 (patch) | |
| tree | 02f459046be9a20f306efb2c3bd00b3f8fa107ee | |
| parent | 9b725f9aef84663726b9f8cad94b941c2c705c41 (diff) | |
| download | mariadb-git-4174fc1a1bd1f1c29f10264108269bf2e18e2f24.tar.gz | |
MDEV-24295: Fix the WITH_MSAN build
For some reason, commit 5bb5d4ad3a687ac61a9c5f8ffff6dd231f9b581a
made clang++-11 unhappy about a constexpr declaration.
| -rw-r--r-- | tpool/tpool_generic.cc | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/tpool/tpool_generic.cc b/tpool/tpool_generic.cc index 7e6a7f0444d..ddc5af4a72b 100644 --- a/tpool/tpool_generic.cc +++ b/tpool/tpool_generic.cc @@ -561,7 +561,12 @@ void thread_pool_generic::worker_main(worker_data *thread_var) Helper function, to be used inside maintenance callback, before m_last_activity is updated */ -constexpr auto invalid_timestamp= std::chrono::system_clock::time_point::max(); +#if __has_feature(memory_sanitizer) +const /* WITH_MSAN in clang++-11 does not work with constexpr */ +#else +constexpr +#endif +auto invalid_timestamp= std::chrono::system_clock::time_point::max(); constexpr auto max_idle_time= std::chrono::minutes(1); /* Time since maintenance timer had nothing to do */ |