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

Fix build failures

Browse Source 
Changes to the ChangeMasterOptions made it non-trivial so it cannot be
safely memset anymore. The maxavrocheck was missing the linkage to the
maxscale-common library.
This commit is contained in:
Markus Mäkelä
2018-09-08 17:30:09 +03:00
parent c447e5cf15
commit 4f6990f90d
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
avro/CMakeLists.txt
View File

@ -4,7 +4,7 @@ if (AVRO_FOUND AND JANSSON_FOUND)
target_link_libraries(maxavro maxscale-common ${JANSSON_LIBRARIES}) target_link_libraries(maxavro maxscale-common ${JANSSON_LIBRARIES})
add_executable(maxavrocheck maxavrocheck.c) add_executable(maxavrocheck maxavrocheck.c)
target_link_libraries(maxavrocheck maxavro) target_link_libraries(maxavrocheck maxavro maxscale-common)
install_executable(maxavrocheck core) install_executable(maxavrocheck core)
add_subdirectory(test) add_subdirectory(test)
endif() endif()

2
server/modules/routing/binlogrouter/test/testbinlog.cc
View File

@ -511,7 +511,7 @@ int main(int argc, char** argv)
* Expected rc is 0, if 1 test fails * Expected rc is 0, if 1 test fails
*/ */
strcpy(error_string, ""); strcpy(error_string, "");
memset(&change_master, 0, sizeof(change_master)); change_master = ChangeMasterOptions{};
strcpy(query, strcpy(query,
"CHANGE MASTER TO MasTER_hoST = '127.0.0.1', MASTER_PORT=9999, MASTER_PASSWORD='massi', MAster_user='eee', master_log_file= 'fffff', master_log_pos= 55" "CHANGE MASTER TO MasTER_hoST = '127.0.0.1', MASTER_PORT=9999, MASTER_PASSWORD='massi', MAster_user='eee', master_log_file= 'fffff', master_log_pos= 55"
+ command_offset); + command_offset);