diff options
| author | Jan Lindström <jplindst@mariadb.org> | 2014-04-15 14:28:25 +0300 |
|---|---|---|
| committer | Jan Lindström <jplindst@mariadb.org> | 2014-04-15 14:28:25 +0300 |
| commit | 13c73c31c320877bb3a7b7035631ccdd6eee4c2a (patch) | |
| tree | db2f61e2cdfb0bad0bf8929cb25fc01aa01f2504 /cmake/lz4.cmake | |
| parent | 88765c3b4d7357ed5a063abb46cabf72c26e7b32 (diff) | |
| download | mariadb-git-13c73c31c320877bb3a7b7035631ccdd6eee4c2a.tar.gz | |
Added support for LZO compression method.
Removed: innodb_use_lz4 configuration parameter
Added: innodb_compression_algorithm configuration parameter
0 = no compression, 1 = ZLIB, 2 = LZ4, 3 = LZO
Fixed issue with incorrect trim calculations
Diffstat (limited to 'cmake/lz4.cmake')
| -rw-r--r-- | cmake/lz4.cmake | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/cmake/lz4.cmake b/cmake/lz4.cmake index 56120e2cdd0..bb2300891eb 100644 --- a/cmake/lz4.cmake +++ b/cmake/lz4.cmake @@ -15,21 +15,21 @@ MACRO (MYSQL_CHECK_LZ4) CHECK_INCLUDE_FILES(lz4.h HAVE_LZ4_H) -CHECK_LIBRARY_EXISTS(liblz4.a LZ4_compress_limitedOutput "" HAVE_LZ4_LIB) - -IF(HAVE_LZ4_LIB AND HAVE_LZ4_H) - ADD_DEFINITIONS(-DHAVE_LZ4=1) - LINK_LIBRARIES(liblz4.a) -ENDIF() -ENDMACRO() - -MACRO (MYSQL_CHECK_SHARED_LZ4) - -CHECK_INCLUDE_FILES(lz4.h HAVE_LZ4_H) CHECK_LIBRARY_EXISTS(lz4 LZ4_compress_limitedOutput "" HAVE_LZ4_SHARED_LIB) IF (HAVE_LZ4_SHARED_LIB AND HAVE_LZ4_H) ADD_DEFINITIONS(-DHAVE_LZ4=1) - LINK_LIBRARIES(lz4) + LINK_LIBRARIES(lz4) ENDIF() ENDMACRO() + +MACRO (MYSQL_CHECK_LZ4_STATIC) + + CHECK_INCLUDE_FILES(lz4.h HAVE_LZ4_H) + CHECK_LIBRARY_EXISTS(liblz4.a LZ4_compress_limitedOutput "" HAVE_LZ4_LIB) + + IF(HAVE_LZ4_LIB AND HAVE_LZ4_H) + ADD_DEFINITIONS(-DHAVE_LZ4=1) + LINK_LIBRARIES(liblz4.a) + ENDIF() +ENDMACRO()
\ No newline at end of file |