From: Joerg Bruehe
Date: October 3 2010 4:24pm
Subject: bzr commit into mysql-5.5-bugfixing branch (joerg:3208) Bug#56267
List-Archive: http://lists.mysql.com/commits/119783
X-Bug: 56267
Message-Id: <201010031625.o93GPQpK007565@rcsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============6923867906588968425=="

--===============6923867906588968425==
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

#At file:///MySQL/REPO/V55/bug56267-5.5/ based on revid:alik@stripped

 3208 Joerg Bruehe	2010-10-03
      Fix bug#56267:
      tcmalloc lib (libtcmalloc_minimal.so) is missing from mysql 5.5 binary
      
      Ensure that a "-DMALLOC_LIB=/foo/bar/libtcmalloc_minimal.so"
      will ensure that this library gets included in the tar.gz
      binary package.
      
      It depends on the build environment to set this variable
      to the correct path name, if it is available.

    modified:
      scripts/CMakeLists.txt
=== modified file 'scripts/CMakeLists.txt'
--- a/scripts/CMakeLists.txt	2010-09-07 15:05:16 +0000
+++ b/scripts/CMakeLists.txt	2010-10-03 16:24:45 +0000
@@ -81,12 +81,11 @@ INSTALL(FILES 
 )
 
 # TCMalloc hacks
-IF($ENV{MALLOC_LIB})
-  SET(MALLOC_LIB $ENV{MALLOC_LIB} CACHE STRING "malloc library")
-ENDIF()
-
 IF(MALLOC_LIB)
-  INSTALL(FILES ${MALLOC_LIB} DESTINATION lib OPTIONAL)
+  MESSAGE("Using tcmalloc '${MALLOC_LIB}'")
+  INSTALL(FILES ${MALLOC_LIB} DESTINATION ${INSTALL_LIBDIR} OPTIONAL)
+ELSE()
+  MESSAGE("No 'MALLOC_LIB' variable")
 ENDIF()
 
 IF(CMAKE_GENERATOR MATCHES "Makefiles")


--===============6923867906588968425==
MIME-Version: 1.0
Content-Type: text/bzr-bundle; charset="us-ascii";
	name="bzr/joerg@stripped"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: joerg@stripped
# target_branch: file:///MySQL/REPO/V55/bug56267-5.5/
# testament_sha1: fe1c66cf938203aa0ac04d2194d93f15d0dc3390
# timestamp: 2010-10-03 18:24:49 +0200
# base_revision_id: alik@stripped
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWWuLU38AAa7fgAAQXOf/93+3
3gC////6UARBapDV7NWs7q2CURFN6TTAVG9MmmmUynqbUeoabU9R6TGRijT1BJJNJgDTQQIn6kbU
aaaeoGIDIAAJQmhGkxJg1TyZqCM1AZBkyAAwg5gTE0GEyZMmRhME00yMTAEMAlFNU/RplGptT9Ka
bKNMjQ9TQHpABoAA/sMdZD5+B7ddT5S4xtrWIcqVKhAxmDBU1/J+aHk2a+7bRi2ueuUVTf4k3J91
M3Vvea+fBca0eXS5Fxc4P9gHsW9vrohXU+YXX+lLxx41t/kLYFMskbRhY8r6O1vV6X/avVNDBk7x
9fsKhK8P7bWm5PNh7iDQ9RFMVCF6Z4HFhjqd9MubLCJFWxOyhMk/RxUsY7pqZ598yWjMLiMDDCYQ
0Bi0WRe8Dm3sDN0JNMCLLQSnkgAdEjSavRBGhWW1Zirz08KZW8URrSziv1dlOmnxFfJ68jZI55Ty
1ZsQKewovcIpRHTONgI4TYIGtNbLQlMviJbxCZ7F1SmJOt3Ho5xVCkeMrrah5jepITKsvmzWF84n
i1plaJ/O/bVKmwKdBVkI6bi4WuDoMb7UGOUsOQzco9PXJCybfbw2aKmL1YTUVCqbI0dZv4pVl2bE
5x5xRd2XiwS/LjnbRXnL70yV+B44nAWbTUDE+Gt04CV2GmNBSUVqK2gjl1l9VnFmuSuNtSpJXpFK
yUhy2khSg+bXYMlbwyLkrWVSMOyLNXJhKa9ZfrtK9/Amff248YG9Os+Pf/AVuM0iKqsO+dhFzBsm
rkRYcOyM4t27PU6kOVEfRhBA7A6fogwkA0Ld9K7DId2ksTVWDEXamcixgLBLfCuhNS26VDWfrweJ
WA+fHr1nDad154jtEX7Dho7QiSFgRiUGs7pk76EIEsquiK1as97qujyy8NhSkZ0bItfnMgrzXOxj
qINuWJnH47OzVdeiq2Jwh8kQnmx1dU+SBDTHC3IjorJdS7abTNOej4X6UVcRqnYwHUvHg+jd8zsx
pg5sbzQQhu3SrHJustvfWezH2S0rHyYTlltMRpRUbMVY7EC+C2hDZQHSKTQJQwNYptIHdy34c7HI
qyMC6RsGAvziOpzT3cxFpBpEWMSRT0nRhkfkTQCz6dyLgjSbMZikelWGxPS+QHnILmCOwZTTkra0
MO1PnVZAnuiNZ5OeuQqlK27yTOfUVk/baZTOi2pcGrgiTKA8ZwoB2CozKou9cDLurSYsdzB5aIX3
Ig4mLQJihBOkicuqRnL91JyH7wJxVbUVHIElQvdk2qN7k7YpPZMm4P6Ph0G8ozDL+eYDSTaCjcHU
+xisHLV6pFeyFeqkCtVRWFUsyOxTUcbDGJBAmLEelMA3BxcRaZFnNeUoHjaY+etW54asZZ4p3bU5
hiahjYzgyrHOyvpwKMob/PBjiC6DitXQgWpROt8JEtSTUMBE0y4oVS6UWY7QM2g2Yj5nObASuCIu
vHgHpYGRIpYNdtipXq/Wo7IaorloBhjhzYXlizaAO8J1GZLjqWWPSKRZ7U5XEcBSC5PGg9uXFstt
pjRHYbv6vJ/m/4u5IpwoSDXFqb+A


--===============6923867906588968425==--