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

Merge branch '2.2' into develop

Browse Source
This commit is contained in:
Markus Mäkelä
2018-04-30 12:38:19 +03:00
parent 2f8bb71a58 1e700ab9ba
commit 490d8c0963
10 changed files with 93 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
maxscale-system-test/CMakeLists.txt
View File

@ -701,6 +701,10 @@ add_test_executable(mxs1808_long_data.cpp mxs1808_long_data replication LABELS r
# https://jira.mariadb.org/browse/MXS-1824
add_test_executable(mxs1824_double_cursor.cpp mxs1824_double_cursor replication LABELS readwritesplit REPL_BACKEND)
# MXS-1831: No error on invalid monitor parameter alteration
# https://jira.mariadb.org/browse/MXS-1831
add_test_executable(mxs1831_unknown_param.cpp mxs1831_unknown_param replication LABELS REPL_BACKEND)
# 'namedserverfilter' test
add_test_executable(namedserverfilter.cpp namedserverfilter namedserverfilter LABELS namedserverfilter LIGHT REPL_BACKEND)