database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

Merge branch '10.2' into 10.3

Browse Source
This commit is contained in:
Sergei Golubchik
2019-03-29 19:40:56 +01:00
parent a82cfe109c cc71e7501c
commit 4e1d3f83b7
49 changed files with 642 additions and 254 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
storage/mroonga/lib/mrn_context_pool.cpp
View File

@@ -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_;