diff options
Diffstat (limited to 'dev-db/mydumper/files')
| -rw-r--r-- | dev-db/mydumper/files/mydumper-atomic.patch | 27 | ||||
| -rw-r--r-- | dev-db/mydumper/files/mydumper-mariadb-define.patch | 28 |
2 files changed, 55 insertions, 0 deletions
diff --git a/dev-db/mydumper/files/mydumper-atomic.patch b/dev-db/mydumper/files/mydumper-atomic.patch new file mode 100644 index 000000000000..405e6883fbcb --- /dev/null +++ b/dev-db/mydumper/files/mydumper-atomic.patch @@ -0,0 +1,27 @@ +diff --git a/cmake/modules/FindMySQL.cmake b/cmake/modules/FindMySQL.cmake +index 23470a8..2b8ae63 100644 +--- a/cmake/modules/FindMySQL.cmake ++++ b/cmake/modules/FindMySQL.cmake +@@ -85,20 +85,8 @@ find_path(MYSQL_INCLUDE_DIR mysql.h + + set(TMP_MYSQL_LIBRARIES "") + set(CMAKE_FIND_LIBRARY_SUFFIXES .so .a .lib .so.1) +-foreach(MY_LIB ${MYSQL_ADD_LIBRARIES}) +- find_library("MYSQL_LIBRARIES_${MY_LIB}" NAMES ${MY_LIB} +- HINTS +- ${MYSQL_ADD_LIBRARY_PATH} +- /usr/lib/mysql +- /usr/lib +- /usr/local/lib +- /usr/local/lib/mysql +- /usr/local/mysql/lib +- ) +- list(APPEND TMP_MYSQL_LIBRARIES "${MYSQL_LIBRARIES_${MY_LIB}}") +-endforeach(MY_LIB ${MYSQL_ADD_LIBRARIES}) +- +-set(MYSQL_LIBRARIES ${TMP_MYSQL_LIBRARIES} CACHE FILEPATH INTERNAL) ++ ++set(MYSQL_LIBRARIES ${MYSQL_ADD_LIBRARIES} CACHE FILEPATH INTERNAL) + + if(MYSQL_INCLUDE_DIR AND MYSQL_LIBRARIES) + set(MYSQL_FOUND TRUE CACHE INTERNAL "MySQL found") diff --git a/dev-db/mydumper/files/mydumper-mariadb-define.patch b/dev-db/mydumper/files/mydumper-mariadb-define.patch new file mode 100644 index 000000000000..ee39a33be818 --- /dev/null +++ b/dev-db/mydumper/files/mydumper-mariadb-define.patch @@ -0,0 +1,28 @@ +--- a/mydumper.c 2017-09-07 14:53:02.000000000 +0000 ++++ b/mydumper.c 2017-10-25 14:53:46.614729185 +0000 +@@ -22,6 +22,11 @@ + #define _FILE_OFFSET_BITS 64 + + #include <mysql.h> ++ ++#if defined MARIADB_CLIENT_VERSION_STR && !defined MYSQL_SERVER_VERSION ++ #define MYSQL_SERVER_VERSION MARIADB_CLIENT_VERSION_STR ++#endif ++ + #include <unistd.h> + #include <stdio.h> + #include <string.h> +--- a/myloader.c 2017-09-07 14:53:02.000000000 +0000 ++++ b/myloader.c 2017-10-25 14:55:34.677729185 +0000 +@@ -19,6 +19,11 @@ + #define _FILE_OFFSET_BITS 64 + + #include <mysql.h> ++ ++#if defined MARIADB_CLIENT_VERSION_STR && !defined MYSQL_SERVER_VERSION ++ #define MYSQL_SERVER_VERSION MARIADB_CLIENT_VERSION_STR ++#endif ++ + #include <unistd.h> + #include <stdio.h> + #include <string.h> |