Complete merge of latest develop branch

2015-06-22 10:39:13 +01:00
parent 4c38e2224b
commit b880350cf3
8 changed files with 990 additions and 60 deletions
--- a/log_manager/log_manager.cc
+++ b/log_manager/log_manager.cc
@ -302,8 +302,6 @@ static int find_last_seqno(strpart_t* parts, int seqno, int seqnoidx);
 void flushall_logfiles(bool flush);
 bool thr_flushall_check();

-#include "../core/atomic.c"
-
 const char* get_suffix_default(void)
 {
        return ".log";