diff --git a/deps/mariadb-client-library/cmakelists.txt.patch b/deps/mariadb-client-library/cmakelists.txt.patch index 40c0a5d038..08ffac1c9a 100644 --- a/deps/mariadb-client-library/cmakelists.txt.patch +++ b/deps/mariadb-client-library/cmakelists.txt.patch @@ -1,5 +1,5 @@ diff --git CMakeLists.txt CMakeLists.txt -index d7150b4d..86c4dc6c 100644 +index d7150b4d..ff32e2f2 100644 --- CMakeLists.txt +++ CMakeLists.txt @@ -286,7 +286,7 @@ ELSEIF() @@ -11,3 +11,12 @@ index d7150b4d..86c4dc6c 100644 ENDIF() +@@ -405,7 +405,7 @@ IF ((NOT WIN32) AND (CMAKE_C_COMPILER_ID MATCHES "Clang" OR CMAKE_C_COMPILER_ID + ELSEIF(CMAKE_C_COMPILER_ID MATCHES "MSVC") + SET(WARNING_AS_ERROR "/WX") + ENDIF() +-SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${WARNING_AS_ERROR}") ++SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${WARNING_AS_ERROR} -Wno-deprecated-non-prototype") + ENDIF() + + diff --git a/test/tap/tests/test_binlog_fast_forward-t.cpp b/test/tap/tests/test_binlog_fast_forward-t.cpp index 38ace98adc..7ef315cf9e 100644 --- a/test/tap/tests/test_binlog_fast_forward-t.cpp +++ b/test/tap/tests/test_binlog_fast_forward-t.cpp @@ -46,7 +46,7 @@ int pull_replication(MYSQL *mysql, int server_id) { rpl->start_position= 4; rpl->flags= MARIADB_RPL_BINLOG_SEND_ANNOTATE_ROWS; if (mariadb_rpl_open(rpl)) { - fprintf(stderr, "File %s, line %d, Error: %s\n", __FILE__, __LINE__, mariadb_rpl_error(rpl)); + fprintf(stderr, "File %s, line %d, Error: '%d':%s\n", __FILE__, __LINE__, mysql_errno(rpl->mysql), mysql_error(rpl->mysql)); return exit_status(); } int num_heartbeats = 0;