hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch '2.1' into develop

Browse Source
This commit is contained in:
Johan Wikman
2017-02-16 11:10:11 +02:00
parent a0b599730c 99edaf6b56
commit 7a6c38bd13
6 changed files with 30 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
server/modules/CMakeLists.txt
View File

@ -3,4 +3,3 @@ add_subdirectory(protocol)
add_subdirectory(monitor)
add_subdirectory(filter)
add_subdirectory(authenticator)
add_subdirectory(include)

4
server/modules/filter/luafilter/luafilter.c
View File

@ -64,7 +64,7 @@ static void setUpstream(MXS_FILTER *instance, MXS_FILTER_SESSION *fsession, MXS
static int32_t routeQuery(MXS_FILTER *instance, MXS_FILTER_SESSION *fsession, GWBUF *queue);
static int32_t clientReply(MXS_FILTER *instance, MXS_FILTER_SESSION *fsession, GWBUF *queue);
static void diagnostic(MXS_FILTER *instance, MXS_FILTER_SESSION *fsession, DCB *dcb);
static uint64_t getCapabilities(void);
static uint64_t getCapabilities(MXS_FILTER *instance);
/**
* The module entry point routine. It is this routine that
@ -668,7 +668,7 @@ static void diagnostic(MXS_FILTER *instance, MXS_FILTER_SESSION *fsession, DCB *
*
* @return The capabilities of the filter.
*/
static uint64_t getCapabilities(void)
static uint64_t getCapabilities(MXS_FILTER *instance)
{
return RCAP_TYPE_CONTIGUOUS_INPUT;
}

5
server/modules/include/CMakeLists.txt
View File

@ -1,5 +0,0 @@
file(GLOB HEADERS "*.h")
foreach(var ${HEADERS})
get_filename_component(header ${var} NAME)
install_header(${header} devel)
endforeach()