diff options
| author | Igor Pashev <pashev.igor@gmail.com> | 2017-10-02 10:20:45 +0300 |
|---|---|---|
| committer | Igor Pashev <pashev.igor@gmail.com> | 2017-10-02 11:15:29 +0300 |
| commit | ae475e036e147fa78d35500aa10dc7c52c05a7d9 (patch) | |
| tree | e47839a07e2a42db09e917c75808e688c24c18da | |
| parent | f603b13e46d33094ac926c992dedd3eb2af69183 (diff) | |
| download | mariadb-10.1-ae475e036e147fa78d35500aa10dc7c52c05a7d9.tar.gz | |
Add debian/patches/dyson.patch
| -rw-r--r-- | debian/patches/dyson.patch | 53 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
2 files changed, 54 insertions, 0 deletions
diff --git a/debian/patches/dyson.patch b/debian/patches/dyson.patch new file mode 100644 index 0000000..8721c1b --- /dev/null +++ b/debian/patches/dyson.patch @@ -0,0 +1,53 @@ +Index: mariadb-10.1-10.1.26/sql/mysqld.cc +=================================================================== +--- mariadb-10.1-10.1.26.orig/sql/mysqld.cc ++++ mariadb-10.1-10.1.26/sql/mysqld.cc +@@ -159,16 +159,6 @@ extern "C" { // Because of SCO 3.2V4 + #include <crtdbg.h> + #endif + +-#ifdef HAVE_SOLARIS_LARGE_PAGES +-#include <sys/mman.h> +-#if defined(__sun__) && defined(__GNUC__) && defined(__cplusplus) \ +- && defined(_XOPEN_SOURCE) +-extern int getpagesizes(size_t *, int); +-extern int getpagesizes2(size_t *, int); +-extern int memcntl(caddr_t, size_t, int, caddr_t, int, int); +-#endif /* __sun__ ... */ +-#endif /* HAVE_SOLARIS_LARGE_PAGES */ +- + #ifdef _AIX41 + int initgroups(const char *,unsigned int); + #endif +Index: mariadb-10.1-10.1.26/storage/connect/filamvct.cpp +=================================================================== +--- mariadb-10.1-10.1.26.orig/storage/connect/filamvct.cpp ++++ mariadb-10.1-10.1.26/storage/connect/filamvct.cpp +@@ -65,11 +65,6 @@ + extern int num_read, num_there; // Statistics + static int num_write; + +-#if defined(UNIX) +-// Add dummy strerror (NGC) +-char *strerror(int num); +-#endif // UNIX +- + /***********************************************************************/ + /* Header containing block info for not split VEC tables. */ + /* Block and last values can be calculated from NumRec and Nrec. */ +Index: mariadb-10.1-10.1.26/storage/connect/tabvct.cpp +=================================================================== +--- mariadb-10.1-10.1.26.orig/storage/connect/tabvct.cpp ++++ mariadb-10.1-10.1.26/storage/connect/tabvct.cpp +@@ -71,11 +71,6 @@ + #include "tabvct.h" + #include "valblk.h" + +-#if defined(UNIX) +-//add dummy strerror (NGC) +-char *strerror(int num); +-#endif // UNIX +- + /***********************************************************************/ + /* External function. */ + /***********************************************************************/ diff --git a/debian/patches/series b/debian/patches/series index aa861ff..8ca8a6b 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -21,3 +21,4 @@ mips-innobase-atomic.patch fix-FTBFS-on-GNU-Hurd.patch mytop-merge_src:mytop_improvements.patch Add_default_ExecStartPre_to_mariadb@.service.patch +dyson.patch |