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

2
Documentation/Release-Notes/MaxScale-2.1.0-Release-Notes.md
View File

@ -1,4 +1,4 @@
# MariaDB MaxScale 2.1.0 Release Notes # MariaDB MaxScale 2.1.0 Release Notes -- 2017-02-16
Release 2.1.0 is a Beta release. Release 2.1.0 is a Beta release.

22
include/maxscale/CMakeLists.txt
View File

@ -1,5 +1,25 @@
file(GLOB HEADERS "*.h*") # Install static C headers
file(GLOB HEADERS "*.h")
foreach(var ${HEADERS}) foreach(var ${HEADERS})
get_filename_component(header ${var} NAME) get_filename_component(header ${var} NAME)
install_header(${header} devel) install_header(${header} devel)
endforeach() endforeach()
# Install static C++ headers
file(GLOB HEADERS "*.hh")
foreach(var ${HEADERS})
get_filename_component(header ${var} NAME)
install_header(${header} devel)
endforeach()
# Install generated C headers
file(GLOB GENERATD_HEADERS "${CMAKE_BINARY_DIR}/include/maxscale/*.h")
foreach(var ${GENERATD_HEADERS})
install_header(${var} devel)
endforeach()
# Install generated C++ headers
file(GLOB GENERATD_HEADERS "${CMAKE_BINARY_DIR}/include/maxscale/*.hh")
foreach(var ${GENERATD_HEADERS})
install_header(${var} devel)
endforeach()

12
server/maxscale.cnf.template
View File

@ -1,10 +1,10 @@
# MaxScale documentation on GitHub: # MaxScale documentation on GitHub:
# https://github.com/mariadb-corporation/MaxScale/blob/master/Documentation/Documentation-Contents.md # https://github.com/mariadb-corporation/MaxScale/blob/2.1/Documentation/Documentation-Contents.md
# Global parameters # Global parameters
# #
# Complete list of configuration options: # Complete list of configuration options:
# https://github.com/mariadb-corporation/MaxScale/blob/master/Documentation/Getting-Started/Configuration-Guide.md # https://github.com/mariadb-corporation/MaxScale/blob/2.1/Documentation/Getting-Started/Configuration-Guide.md
[maxscale] [maxscale]
threads=1 threads=1
@ -25,7 +25,7 @@ protocol=MySQLBackend
# #
# This will keep MaxScale aware of the state of the servers. # This will keep MaxScale aware of the state of the servers.
# MySQL Monitor documentation: # MySQL Monitor documentation:
# https://github.com/mariadb-corporation/MaxScale/blob/master/Documentation/Monitors/MySQL-Monitor.md # https://github.com/mariadb-corporation/MaxScale/blob/2.1/Documentation/Monitors/MySQL-Monitor.md
[MySQL Monitor] [MySQL Monitor]
type=monitor type=monitor
@ -42,7 +42,7 @@ monitor_interval=10000
# #
# ReadConnRoute documentation: # ReadConnRoute documentation:
# https://github.com/mariadb-corporation/MaxScale/blob/master/Documentation/Routers/ReadConnRoute.md # https://github.com/mariadb-corporation/MaxScale/blob/2.1/Documentation/Routers/ReadConnRoute.md
[Read-Only Service] [Read-Only Service]
type=service type=service
@ -53,7 +53,7 @@ passwd=mypwd
router_options=slave router_options=slave
# ReadWriteSplit documentation: # ReadWriteSplit documentation:
# https://github.com/mariadb-corporation/MaxScale/blob/master/Documentation/Routers/ReadWriteSplit.md # https://github.com/mariadb-corporation/MaxScale/blob/2.1/Documentation/Routers/ReadWriteSplit.md
[Read-Write Service] [Read-Write Service]
type=service type=service
@ -65,7 +65,7 @@ max_slave_connections=100%
# This service enables the use of the MaxAdmin interface # This service enables the use of the MaxAdmin interface
# MaxScale administration guide: # MaxScale administration guide:
# https://github.com/mariadb-corporation/MaxScale/blob/master/Documentation/Reference/MaxAdmin.md # https://github.com/mariadb-corporation/MaxScale/blob/2.1/Documentation/Reference/MaxAdmin.md
[MaxAdmin Service] [MaxAdmin Service]
type=service type=service

1
server/modules/CMakeLists.txt
View File

@ -3,4 +3,3 @@ add_subdirectory(protocol)
add_subdirectory(monitor) add_subdirectory(monitor)
add_subdirectory(filter) add_subdirectory(filter)
add_subdirectory(authenticator) 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 routeQuery(MXS_FILTER *instance, MXS_FILTER_SESSION *fsession, GWBUF *queue);
static int32_t clientReply(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 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 * 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. * @return The capabilities of the filter.
*/ */
static uint64_t getCapabilities(void) static uint64_t getCapabilities(MXS_FILTER *instance)
{ {
return RCAP_TYPE_CONTIGUOUS_INPUT; 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()