Merge remote-tracking branch 'origin/master'

CMakeLists.txt

@@ -31,6 +31,8 @@ ENDIF()
 
 MESSAGE(STATUS "Running cmake version ${CMAKE_VERSION}")
 
+file(STRINGS ./rpm/obclient-VER.txt OBCLIENT_VERSION LIMIT_COUNT 1)
+
 SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH}
   ${CMAKE_SOURCE_DIR}/cmake ${CMAKE_SOURCE_DIR}/cmake/Internal/CPack)
 

build.sh

@@ -26,12 +26,12 @@ cmake . \
 -DOPENSSL_SSL_LIBRARY=$DEP_DIR/lib/libssl.a \
 -DOPENSSL_CRYPTO_LIBRARY=$DEP_DIR/lib/libcrypto.a \
 -DCURSES_CURSES_H_PATH=$DEP_DIR/include \
--DCURSES_CURSES_LIBRARY=$DEP_DIR/lib/libcurses.a \
--DCURSES_FORM_LIBRARY=$DEP_DIR/lib/libform.a \
+-DCURSES_CURSES_LIBRARY=$DEP_DIR/lib/libcurses.so \
 -DCURSES_HAVE_CURSES_H=$DEP_DIR/include/curses.h \
 -DCURSES_INCLUDE_PATH=$DEP_DIR/include \
--DCURSES_LIBRARY=$DEP_DIR/lib/libcurses.a \
--DCURSES_NCURSES_LIBRARY=$DEP_DIR/lib/libncurses.a \
+-DCURSES_LIBRARY=$DEP_DIR/lib/libcurses.so \
+-DCURSES_NCURSES_LIBRARY=$DEP_DIR/lib/libncurses.so \
+-DCURSES_FORM_LIBRARY=$DEP_DIR/lib/libform.so \
 -DWITH_ZLIB=system \
 -DWITH_LIBWRAP=0 \
 -DENABLED_LOCAL_INFILE=1 \

client/client_priv.h

@@ -104,6 +104,10 @@ enum options_client
   OPT_SHUTDOWN_WAIT_FOR_SLAVES,
   OPT_PROXY_MODE,
   OPT_INIT_SQL,
+  OPT_OB_DISABLE_COMMANDS,
+  OPT_OB_SERVICE_NAME,
+  OPT_OB_PROXY_USER,
+  OPT_OB_SOCKET5_PROXY,
   OPT_MAX_CLIENT_OPTION /* should be always the last */
 };