projects / packages / percona-server.git / blame
| Commit | Line | Data |
|---|---|---|
| 0beb0def AM |
1 | this sucks, in .c files they use "lz4" prefix, but in cmake no prefix |
| 2 | ||
| 3 | and should really just use pkgconfig | |
| 4 | ||
| 5 | and it's iconsistent as well! | |
| 6 | ||
| 7 | --- mysql-5.7.16/cmake/lz4.cmake~ 2016-09-28 20:02:44.000000000 +0300 | |
| 8 | +++ mysql-5.7.16/cmake/lz4.cmake 2016-12-12 11:37:18.923456466 +0200 | |
| 9 | @@ -17,7 +17,7 @@ | |
| 10 | # bundled is the default | |
| 11 | ||
| 12 | MACRO (FIND_SYSTEM_LZ4) | |
| 13 | - FIND_PATH(PATH_TO_LZ4 NAMES lz4frame.h) | |
| 14 | + FIND_PATH(PATH_TO_LZ4 NAMES lz4/lz4frame.h) | |
| 15 | FIND_LIBRARY(LZ4_SYSTEM_LIBRARY NAMES lz4) | |
| 16 | IF (PATH_TO_LZ4 AND LZ4_SYSTEM_LIBRARY) | |
| 17 | SET(SYSTEM_LZ4_FOUND 1) | |
| 18 | --- mysql-5.7.16/storage/innobase/os/os0file.cc~ 2016-09-28 20:02:44.000000000 +0300 | |
| 19 | +++ mysql-5.7.16/storage/innobase/os/os0file.cc 2016-12-12 12:12:43.810635067 +0200 | |
| 20 | @@ -70,7 +70,7 @@ | |
| 21 | # include <linux/falloc.h> | |
| 22 | #endif /* HAVE_FALLOC_PUNCH_HOLE_AND_KEEP_SIZE */ | |
| 23 | ||
| 24 | -#include <lz4.h> | |
| 25 | +#include <lz4/lz4.h> | |
| 26 | #include <zlib.h> | |
| 27 | ||
| 28 | #ifdef UNIV_DEBUG | |
| 29 | @@ -8435,7 +8435,7 @@ | |
| 30 | #include "fil0fil.h" | |
| 31 | #include "os0file.h" | |
| 32 | ||
| 33 | -#include <lz4.h> | |
| 34 | +#include <lz4/lz4.h> | |
| 35 | #include <zlib.h> | |
| 36 | ||
| 37 | #include <my_aes.h> | |
| 38 | --- mysql-5.7.16/client/dump/compression_lz4_writer.h~ 2016-09-28 20:02:44.000000000 +0300 | |
| 39 | +++ mysql-5.7.16/client/dump/compression_lz4_writer.h 2016-12-12 12:17:53.912464632 +0200 | |
| 40 | @@ -21,7 +21,7 @@ | |
| 41 | #include "i_output_writer.h" | |
| 42 | #include "abstract_output_writer_wrapper.h" | |
| 43 | #include "i_callable.h" | |
| 44 | -#include <lz4frame.h> | |
| 45 | +#include <lz4/lz4frame.h> | |
| 46 | #include "base/mutex.h" | |
| 47 | #include <string.h> | |
| 48 | ||
| 49 | --- mysql-5.7.17/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_message_stage_lz4.cc~ 2016-11-28 15:32:52.000000000 +0200 | |
| 50 | +++ mysql-5.7.17/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_message_stage_lz4.cc 2016-12-14 16:39:53.124878289 +0200 | |
| 51 | @@ -15,7 +15,7 @@ | |
| 52 | ||
| 53 | #include "gcs_internal_message.h" | |
| 54 | #include "gcs_message_stage_lz4.h" | |
| 55 | -#include <lz4.h> | |
| 56 | +#include <lz4/lz4.h> | |
| 57 | #include <mysql/gcs/xplatform/byteorder.h> | |
| 58 | #include "gcs_logging.h" | |
| 59 | #include <string.h> |