diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2019-03-29 10:58:20 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2019-03-29 10:58:20 +0100 |
| commit | f2a0c758da3d9f0fa42c96114b453cf4835bcbab (patch) | |
| tree | d51cdc29774cfc04f522e2253542d73c94a9728b /storage/mroonga | |
| parent | fc168c3a5e58d8b364a2e87e0d876a261ec7fced (diff) | |
| parent | d0116e10a5da52503a89a413e481996ce3f65e63 (diff) | |
| download | mariadb-git-f2a0c758da3d9f0fa42c96114b453cf4835bcbab.tar.gz | |
Merge branch '10.1' into 10.2
Diffstat (limited to 'storage/mroonga')
| -rw-r--r-- | storage/mroonga/lib/mrn_context_pool.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/storage/mroonga/lib/mrn_context_pool.cpp b/storage/mroonga/lib/mrn_context_pool.cpp index d297ee9a338..a26005b16c0 100644 --- a/storage/mroonga/lib/mrn_context_pool.cpp +++ b/storage/mroonga/lib/mrn_context_pool.cpp @@ -77,7 +77,7 @@ namespace mrn { } private: - static const unsigned int CLEAR_THREATHOLD_IN_SECONDS = 60 * 5; + static const int CLEAR_THREATHOLD_IN_SECONDS = 60 * 5; mysql_mutex_t *mutex_; LIST *pool_; |