]>
Commit | Line | Data |
---|---|---|
deef2632 AM |
1 | --- percona-server-5.7.27-30/storage/tokudb/PerconaFT/portability/portability.cc~ 2019-08-20 06:44:15.000000000 +0200 |
2 | +++ percona-server-5.7.27-30/storage/tokudb/PerconaFT/portability/portability.cc 2019-08-23 10:06:37.642878792 +0200 | |
3 | @@ -60,9 +60,6 @@ Copyright (c) 2006, 2015, Percona and/or | |
4 | #if defined(HAVE_SYS_SYSCALL_H) | |
5 | # include <sys/syscall.h> | |
6 | #endif | |
7 | -#if defined(HAVE_SYS_SYSCTL_H) | |
8 | -# include <sys/sysctl.h> | |
9 | -#endif | |
10 | #if defined(HAVE_PTHREAD_NP_H) | |
11 | # include <pthread_np.h> | |
12 | #endif | |
ff291e4e AM |
13 | --- percona-server-5.7.29-32/storage/rocksdb/CMakeLists.txt~ 2020-01-20 15:25:37.000000000 +0100 |
14 | +++ percona-server-5.7.29-32/storage/rocksdb/CMakeLists.txt 2020-02-17 10:50:15.600870732 +0100 | |
15 | @@ -124,7 +124,7 @@ ENDIF() | |
16 | # get a list of rocksdb library source files | |
17 | # run with env -i to avoid passing variables | |
18 | EXECUTE_PROCESS( | |
19 | - COMMAND env -i ${CMAKE_CURRENT_SOURCE_DIR}/get_rocksdb_files.sh | |
20 | + COMMAND env -i PATH=$ENV{PATH} ${CMAKE_CURRENT_SOURCE_DIR}/get_rocksdb_files.sh | |
21 | OUTPUT_VARIABLE SCRIPT_OUTPUT | |
22 | WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} | |
23 | ) |