database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-08-01 06:46:55 +03:00
Code Activity

Moved the SKIP_OAM_INIT check for cleanliness, added 'config.h' to

Browse Source 
other places that need it.
This commit is contained in:
Patrick LeBlanc
2018-10-03 12:13:23 -05:00
parent 6626045535
commit e47e784c53
3 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
configureEngine.cmake
View File

@ -17,9 +17,6 @@ INCLUDE (CheckSymbolExists)
INCLUDE (CheckCXXSymbolExists) INCLUDE (CheckCXXSymbolExists)
INCLUDE (CheckTypeSize) INCLUDE (CheckTypeSize)
IF($ENV{SKIP_OAM_INIT})
SET(SKIP_OAM_INIT 1)
ENDIF()
CHECK_INCLUDE_FILE_CXX (alloca.h HAVE_ALLOCA_H) CHECK_INCLUDE_FILE_CXX (alloca.h HAVE_ALLOCA_H)
CHECK_INCLUDE_FILE_CXX (arpa/inet.h HAVE_ARPA_INET_H) CHECK_INCLUDE_FILE_CXX (arpa/inet.h HAVE_ARPA_INET_H)
CHECK_INCLUDE_FILE_CXX (dlfcn.h HAVE_DLFCN_H) CHECK_INCLUDE_FILE_CXX (dlfcn.h HAVE_DLFCN_H)
@ -719,7 +716,9 @@ IF (NOT INLINE)
SET (inline "") SET (inline "")
ENDIF() ENDIF()
IF($ENV{SKIP_OAM_INIT})
SET(SKIP_OAM_INIT 1)
ENDIF()
EXECUTE_PROCESS( EXECUTE_PROCESS(
COMMAND rm -f conftest.data conftest.file conftest.sym COMMAND rm -f conftest.data conftest.file conftest.sym

1
writeengine/redistribute/we_redistributecontrolthread.cpp
View File

@ -37,6 +37,7 @@ using namespace std;
#include "boost/filesystem/operations.hpp" #include "boost/filesystem/operations.hpp"
using namespace boost; using namespace boost;
#include "config.h"
#include "installdir.h" #include "installdir.h"
#include "configcpp.h" #include "configcpp.h"

1
writeengine/splitter/we_sdhandler.cpp
View File

@ -43,6 +43,7 @@ using namespace std;
#include <boost/thread.hpp> #include <boost/thread.hpp>
using namespace boost; using namespace boost;
#include "config.h"
#include "configcpp.h" #include "configcpp.h"
using namespace config; using namespace config;