From e7c4d823c947db98759d8a277c6ff0b3040aad3a Mon Sep 17 00:00:00 2001 From: Kai Liu Date: Sun, 10 Nov 2013 15:36:30 -0800 Subject: [PATCH] Fix two bugs that caused 3rd party release failure Summary: * Fix the link to gflags. * Fix a warning for the uninitialized data member. --- build_tools/fbcode.clang31.sh | 2 +- build_tools/fbcode.gcc471.sh | 2 +- include/rocksdb/transaction_log.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build_tools/fbcode.clang31.sh b/build_tools/fbcode.clang31.sh index 3204219a4..b2df8cd43 100644 --- a/build_tools/fbcode.clang31.sh +++ b/build_tools/fbcode.clang31.sh @@ -43,7 +43,7 @@ EXEC_LDFLAGS+=" -B$TOOLCHAIN_EXECUTABLES/binutils/binutils-2.21.1/da39a3e/bin" PLATFORM_LDFLAGS="-L$TOOLCHAIN_LIB_BASE/libgcc/libgcc-4.7.1/afc21dc/lib -L$TOOLCHAIN_LIB_BASE/glibc/glibc-2.14.1/99df8fc/lib" -EXEC_LDFLAGS_SHARED="$SNAPPY_LIBS" +EXEC_LDFLAGS_SHARED="$SNAPPY_LIBS $ZLIB_LIBS $GFLAGS_LIBS" SNAPPY_LDFLAGS="$SNAPPY_LIBS" export CC CXX AR RANLIB CFLAGS EXEC_LDFLAGS EXEC_LDFLAGS_SHARED SNAPPY_LDFLAGS diff --git a/build_tools/fbcode.gcc471.sh b/build_tools/fbcode.gcc471.sh index 6fd51f306..3f2e38fc6 100644 --- a/build_tools/fbcode.gcc471.sh +++ b/build_tools/fbcode.gcc471.sh @@ -52,7 +52,7 @@ EXEC_LDFLAGS+=" $HDFSLIB $SNAPPY_LIBS $ZLIB_LIBS $LIBEVENT_LIBS $GFLAGS_LIBS" PLATFORM_LDFLAGS="-L$TOOLCHAIN_LIB_BASE/libgcc/libgcc-4.7.1/afc21dc/lib -L$TOOLCHAIN_LIB_BASE/glibc/glibc-2.14.1/99df8fc/lib" -EXEC_LDFLAGS_SHARED="$SNAPPY_LIBS $ZLIB_LIBS" +EXEC_LDFLAGS_SHARED="$SNAPPY_LIBS $ZLIB_LIBS $GFLAGS_LIBS" SNAPPY_LDFLAGS="$SNAPPY_LIBS $ZLIB_LIBS" VALGRIND_VER="$TOOLCHAIN_LIB_BASE/valgrind/valgrind-3.8.1/91ddd43/bin/" diff --git a/include/rocksdb/transaction_log.h b/include/rocksdb/transaction_log.h index 4da83d021..30105b5e4 100644 --- a/include/rocksdb/transaction_log.h +++ b/include/rocksdb/transaction_log.h @@ -52,7 +52,7 @@ class LogFile { }; struct BatchResult { - SequenceNumber sequence; + SequenceNumber sequence = SequenceNumber(); std::unique_ptr writeBatchPtr; };