commit: 9586b0e19e60f8a7dacc9f2312cbcded06986457 Author: Brian Evans <grknight <AT> gentoo <DOT> org> AuthorDate: Wed Oct 22 19:12:28 2014 +0000 Commit: Brian Evans <grknight <AT> gentoo <DOT> org> CommitDate: Wed Oct 22 19:12:28 2014 +0000 URL: http://sources.gentoo.org/gitweb/?p=proj/mysql-extras.git;a=commit;h=9586b0e1
Patches for maridb-10.1.x --- 00000_index.txt | 9 +++- 20014_all_mariadb-innodb-compression.patch | 71 ++++++++++++++++++++++++++++++ 2 files changed, 78 insertions(+), 2 deletions(-) diff --git a/00000_index.txt b/00000_index.txt index f2f7826..eebd9d1 100644 --- a/00000_index.txt +++ b/00000_index.txt @@ -241,7 +241,7 @@ @@ fix bug #156301 mysql_config wrongly retains too much info from CFLAGS @patch 01050_all_mariadb_mysql_config_cleanup-5.5.patch -@ver 5.05.00.00 to 10.00.99.99 +@ver 5.05.00.00 to 10.99.99.99 @pn mariadb @pn mariadb-galera @@ fix bug #156301 mysql_config wrongly retains too much info from CFLAGS @@ -1668,7 +1668,7 @@ @@ Also install static libs by ENABLE_STATIC_LIBS @patch 20006_all_cmake_elib-mariadb-10.0.11.patch -@ver 10.00.11.00 to 10.00.99.99 +@ver 10.00.11.00 to 10.99.99.99 @pn mariadb @pn mariadb-galera @@ Add ELIBPATH to split client and embedded libs @@ -1755,3 +1755,8 @@ @pn mariadb-galera @@ Fix bad header #error which breaks other builds @@ Gentoo bug 525192 MDEV-6863 + +@patch 20014_all_mariadb-innodb-compression.patch +@ver 10.01.01.00 to 10.99.99.99 +@pn mariadb +@@ Remove magic dependencies on lz4 and lzo diff --git a/20014_all_mariadb-innodb-compression.patch b/20014_all_mariadb-innodb-compression.patch new file mode 100644 index 0000000..b045c8a --- /dev/null +++ b/20014_all_mariadb-innodb-compression.patch @@ -0,0 +1,71 @@ +diff -aruN mysql.orig/cmake/lz4.cmake mysql/cmake/lz4.cmake +--- mysql.orig/cmake/lz4.cmake 2014-10-15 18:53:42.000000000 -0400 ++++ mysql/cmake/lz4.cmake 2014-10-22 13:27:29.084405469 -0400 +@@ -12,8 +12,12 @@ + # this program; if not, write to the Free Software Foundation, Inc., + # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + ++OPTION(WITH_INNODB_LZ4 "Enable lz4 compression on InnoDB/XtraDB" ON) ++ + MACRO (MYSQL_CHECK_LZ4) + ++IF (WITH_INNODB_LZ4) ++ + CHECK_INCLUDE_FILES(lz4.h HAVE_LZ4_H) + CHECK_LIBRARY_EXISTS(lz4 LZ4_compress_limitedOutput "" HAVE_LZ4_SHARED_LIB) + +@@ -21,10 +25,11 @@ + ADD_DEFINITIONS(-DHAVE_LZ4=1) + LINK_LIBRARIES(lz4) + ENDIF() ++ENDIF() + ENDMACRO() + + MACRO (MYSQL_CHECK_LZ4_STATIC) +- ++IF (WITH_INNODB_LZ4) + CHECK_INCLUDE_FILES(lz4.h HAVE_LZ4_H) + CHECK_LIBRARY_EXISTS(liblz4.a LZ4_compress_limitedOutput "" HAVE_LZ4_LIB) + +@@ -32,4 +37,5 @@ + ADD_DEFINITIONS(-DHAVE_LZ4=1) + LINK_LIBRARIES(liblz4.a) + ENDIF() +-ENDMACRO() +\ No newline at end of file ++ENDIF() ++ENDMACRO() +diff -aruN mysql.orig/cmake/lzo.cmake mysql/cmake/lzo.cmake +--- mysql.orig/cmake/lzo.cmake 2014-10-15 18:53:42.000000000 -0400 ++++ mysql/cmake/lzo.cmake 2014-10-22 13:28:37.622202579 -0400 +@@ -12,8 +12,10 @@ + # this program; if not, write to the Free Software Foundation, Inc., + # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + +-MACRO (MYSQL_CHECK_LZO_STATIC) ++OPTION(WITH_INNODB_LZO "Enable lzo compression on InnoDB/XtraDB" ON) + ++MACRO (MYSQL_CHECK_LZO_STATIC) ++IF(WITH_INNODB_LZO) + CHECK_INCLUDE_FILES(lzo/lzo1x.h HAVE_LZO_H) + CHECK_LIBRARY_EXISTS(liblzo2.a lzo1x_1_compress "" HAVE_LZO_LIB) + +@@ -21,10 +23,11 @@ + ADD_DEFINITIONS(-DHAVE_LZO=1) + LINK_LIBRARIES(liblzo2.a) + ENDIF() ++ENDIF() + ENDMACRO() + + MACRO (MYSQL_CHECK_LZO) +- ++IF(WITH_INNODB_LZO) + CHECK_INCLUDE_FILES(lzo/lzo1x.h HAVE_LZO_H) + CHECK_LIBRARY_EXISTS(lzo2 lzo1x_1_compress "" HAVE_LZO_SHARED_LIB) + +@@ -32,4 +35,5 @@ + ADD_DEFINITIONS(-DHAVE_LZO=1) + LINK_LIBRARIES(lzo2) + ENDIF() ++ENDIF() + ENDMACRO()
