diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2020-02-10 20:34:16 +0100 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2020-02-10 20:34:16 +0100 |
| commit | 58b70dc13630d2f2f0244359d6351085d70fd5dd (patch) | |
| tree | bf6600084f6bce9526916a307d0263d398451b0b /storage/innobase/srv | |
| parent | d72038a738b2ece7f50453e0f366ad0b9e5ed7e0 (diff) | |
| parent | 235d7c6f541ef00bec8759bef7d9e1764db20755 (diff) | |
| download | mariadb-git-58b70dc13630d2f2f0244359d6351085d70fd5dd.tar.gz | |
Merge branch '10.2' into 10.3
Diffstat (limited to 'storage/innobase/srv')
| -rw-r--r-- | storage/innobase/srv/srv0srv.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/storage/innobase/srv/srv0srv.cc b/storage/innobase/srv/srv0srv.cc index 556329e138e..6e7b3e5939f 100644 --- a/storage/innobase/srv/srv0srv.cc +++ b/storage/innobase/srv/srv0srv.cc @@ -3,7 +3,7 @@ Copyright (c) 1995, 2017, Oracle and/or its affiliates. All Rights Reserved. Copyright (c) 2008, 2009 Google Inc. Copyright (c) 2009, Percona Inc. -Copyright (c) 2013, 2019, MariaDB Corporation. +Copyright (c) 2013, 2020, MariaDB Corporation. Portions of this file contain modifications contributed and copyrighted by Google, Inc. Those modifications are gratefully acknowledged and are described @@ -487,7 +487,9 @@ current_time % 60 == 0 and no tasks will be performed when current_time % 5 != 0. */ # define SRV_MASTER_CHECKPOINT_INTERVAL (7) -# define SRV_MASTER_PURGE_INTERVAL (10) +#ifdef MEM_PERIODIC_CHECK +# define SRV_MASTER_MEM_VALIDATE_INTERVAL (13) +#endif /* MEM_PERIODIC_CHECK */ # define SRV_MASTER_DICT_LRU_INTERVAL (47) /** Simulate compression failures. */ |