From c06eaf21b78093524e1a39c55415d4eab3d2cd78 Mon Sep 17 00:00:00 2001
From: Sergei Golubchik <sergii@pisem.net>
Date: Sat, 17 Aug 2013 17:20:09 +0400
Subject: MDEV-4165 [PATCH] RFE: make tmpdir a build-time configurable option

support -DTMPDIR=/path in CMakeLists.txt

Patch by Honza Horak.
---
 CMakeLists.txt | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'CMakeLists.txt')

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7e22918dd64..40062957372 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -245,7 +245,9 @@ SET(PLUGINDIR "${DEFAULT_MYSQL_HOME}/${INSTALL_PLUGINDIR}")
 IF(INSTALL_SYSCONFDIR)
   SET(DEFAULT_SYSCONFDIR "${INSTALL_SYSCONFDIR}")
 ENDIF()
-
+IF(TMPDIR)
+  SET(DEFAULT_TMPDIR "${TMPDIR}")
+ENDIF()
 
 # Run platform tests
 INCLUDE(configure.cmake)
-- 
cgit v1.2.1


From cd92bc38a7fd9442f668fbb1eed1634b04cc6d4d Mon Sep 17 00:00:00 2001
From: Sergei Golubchik <sergii@pisem.net>
Date: Fri, 30 Aug 2013 10:56:26 +0200
Subject: start using jemalloc

---
 CMakeLists.txt | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'CMakeLists.txt')

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 40062957372..9b8c9defeb7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -144,6 +144,7 @@ INCLUDE(ssl)
 INCLUDE(readline)
 INCLUDE(libutils)
 INCLUDE(dtrace)
+INCLUDE(jemalloc)
 INCLUDE(ctest)
 INCLUDE(plugin)
 INCLUDE(install_macros)
@@ -263,6 +264,8 @@ MYSQL_CHECK_SSL()
 # Add readline or libedit.
 MYSQL_CHECK_READLINE()
 
+CHECK_JEMALLOC()
+
 #
 # Setup maintainer mode options by the end. Platform checks are
 # not run with the warning options as to not perturb fragile checks
-- 
cgit v1.2.1


From 3de5613445b5e4ba6683769ab15afc3d1c71b5dd Mon Sep 17 00:00:00 2001
From: Sergei Golubchik <sergii@pisem.net>
Date: Tue, 10 Sep 2013 22:53:44 +0200
Subject: INSTALL_DOCUMENTATION function for CMakeLists.txt It puts files in
 the correct location for rpm/deb packages.

---
 CMakeLists.txt | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

(limited to 'CMakeLists.txt')

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9b8c9defeb7..7401fcb56b4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -136,6 +136,7 @@ INCLUDE(mysql_version)
 INCLUDE(cpack_source_ignore_files)
 INCLUDE(install_layout)
 INCLUDE(cpack_rpm)
+INCLUDE(cpack_deb)
 
 # Add macros
 INCLUDE(character_sets)
@@ -364,15 +365,12 @@ ADD_CUSTOM_TARGET(INFO_BIN ALL
   WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
 )
 
-INSTALL(FILES COPYING COPYING.LESSER LICENSE.mysql 
-DESTINATION ${INSTALL_DOCREADMEDIR} 
-COMPONENT Readme
-OPTIONAL
-)
-INSTALL(FILES README DESTINATION ${INSTALL_DOCREADMEDIR} COMPONENT Readme)
-INSTALL(FILES ${CMAKE_BINARY_DIR}/Docs/INFO_SRC ${CMAKE_BINARY_DIR}/Docs/INFO_BIN DESTINATION ${INSTALL_DOCDIR})
+INSTALL_DOCUMENTATION(README COPYING COPYING.LESSER
+                      COMPONENT Readme)
+INSTALL_DOCUMENTATION(${CMAKE_BINARY_DIR}/Docs/INFO_SRC
+                      ${CMAKE_BINARY_DIR}/Docs/INFO_BIN)
 IF(UNIX)
-  INSTALL(FILES Docs/INSTALL-BINARY DESTINATION ${INSTALL_DOCREADMEDIR} COMPONENT Readme)
+  INSTALL_DOCUMENTATION(Docs/INSTALL-BINARY COMPONENT Readme)
 ENDIF()
 
 INCLUDE(CPack)
-- 
cgit v1.2.1