Merge branch 'master' of github.com:mailru/tarantool

cmake/tarantool_cpack.cmake

@@ -12,15 +12,17 @@ set (CPACK_SOURCE_IGNORE_FILES "\\\\.git" "_CPack_Packages"
     "mod/box/tarantool_box"
     "mod/box/tarantool_feeder" "install_manifest.txt"
     "Makefile" "cmake_install.cmake" "test/var/" "\\\\.a")
-set (CPACK_SOURCE_PACKAGE_FILE_NAME
-"tarantool-${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}-src")
+
+set (CPACK_SOURCE_PACKAGE_FILE_NAME "tarantool-${TARANTOOL_VERSION}-src")
 #
 # Provide options for the binary distribution.
 #
 STRING(TOLOWER "${CMAKE_SYSTEM_NAME}-${CMAKE_SYSTEM_PROCESSOR}" platform)
 
-set (CPACK_PACKAGE_FILE_NAME
-"tarantool-${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}-${platform}")
+set (CPACK_PACKAGE_FILE_NAME "tarantool-${TARANTOOL_VERSION}-${platform}")
+if (${CMAKE_BUILD_TYPE} STREQUAL "Debug")
+    set (CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_FILE_NAME}-debug")
+endif()
 
 #
 #

doc/user/language-reference.xml

@@ -102,7 +102,7 @@
       or there is no readily available connector for the
       programming language in use, any existing client driver for
       Memcached will make do as a Tarantool connector.
-      To enable Memcached protocol, turn on
+      To enable text Memcached protocol, turn on
       <olink targetptr="memcached_port"/> in the option file.
       Since Memcached has no notion of spaces or secondary
       indexes, this port only makes it possible to access one
@@ -110,7 +110,10 @@
       targetptr="memcached_space"/>) via its primary key.
       Unless tuple expiration is enabled with <olink
       targetptr="memcached_expire"/>, TTL part of the message is
-      stored but ignored.
+      stored but ignored. Note, that we do not support the binary
+      protocol of Memcached. If top performance
+      is a must, Tarantool's own binary protocol should be
+      used.
   </para>
   </section>
 </section>