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

Fixed merging conflicts.

Browse Source
This commit is contained in:
Markus Makela
2015-02-24 06:34:22 +02:00
parent 9e7afeb302
commit 3b29e1a1f0
2 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
server/core/config.c
View File

@ -324,7 +324,7 @@ int error_count = 0;
is_rwsplit = true; is_rwsplit = true;
} }
char *allow_localhost_match_wildcard_host = allow_localhost_match_wildcard_host =
config_get_value(obj->parameters, "localhost_match_wildcard_host"); config_get_value(obj->parameters, "localhost_match_wildcard_host");
if (obj->element == NULL) /*< if module load failed */ if (obj->element == NULL) /*< if module load failed */

4
server/modules/routing/CMakeLists.txt
View File

@ -5,10 +5,6 @@ if(BUILD_TESTS)
install(TARGETS testroute DESTINATION modules) install(TARGETS testroute DESTINATION modules)
endif() endif()
add_library(testroute SHARED testroute.c)
target_link_libraries(testroute log_manager utils)
install(TARGETS testroute DESTINATION modules)
add_library(schemarouter SHARED schemarouter/schemarouter.c) add_library(schemarouter SHARED schemarouter/schemarouter.c)
target_link_libraries(schemarouter log_manager utils query_classifier) target_link_libraries(schemarouter log_manager utils query_classifier)
install(TARGETS schemarouter DESTINATION modules) install(TARGETS schemarouter DESTINATION modules)