From: Georgi Kodinov
Date: October 4 2010 3:27pm
Subject: bzr commit into mysql-trunk-merge branch (Georgi.Kodinov:3221)
List-Archive: http://lists.mysql.com/commits/119885
Message-Id: <201010041528.o94FS3C2023496@magare.local>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============3464945994119099625=="

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

#At file:///home/kgeorge/mysql/work/wl1054-trunk-merge/ based on revid:georgi.kodinov@stripped

 3221 Georgi Kodinov	2010-10-04 [merge]
      merge

    modified:
      scripts/CMakeLists.txt
=== modified file 'scripts/CMakeLists.txt'
--- a/scripts/CMakeLists.txt	2010-09-13 10:26:57 +0000
+++ b/scripts/CMakeLists.txt	2010-10-04 15:27:31 +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")


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

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: georgi.kodinov@stripped\
#   pocniymthutm9hl6
# target_branch: file:///home/kgeorge/mysql/work/wl1054-trunk-merge/
# testament_sha1: 71d6abd4fee5ac151ae18ae95c008a3b7c03b598
# timestamp: 2010-10-04 18:28:02 +0300
# source_branch: file:///home/kgeorge/mysql/work/wl1054-5.5/
# base_revision_id: georgi.kodinov@stripped\
#   4wu2obty0acvnt6e
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWWMurgoABR7fgAAQXOf/93+/
3gC////6YAkfd5zmh6HooKObdegkaKPZpa06wkqMoxMp6J5T0m1PCaCeo9QNANAAAAiomkNTaNDT
JTNT0n6o9T0epHoTaQMgAGgMoGiYUajGmkZAAGgBoGgDQAkSk9UeKZomIGgNAAaA0AMmRoBzAEYJ
iAYBME0ZDQwCYIxMJIgQEyaBkRknk0p5T1RtR6TRp5E9QB6h/y3VxFbj/T5n2N4xwN0DjxLXsNIC
akX0k7YljI4tNSKCwokV9oqm5EAk5wrDQKBgx1YHHr5OjNZTNANZZANg2YvUVv5rSDOhjcXdO5cl
KjFVcrSvOiaGyeKXMMrOZ5jPPc/r9gZFrNX/ZytaxzGXgCu+WRTo0b+TVkfHxUM+4mEDgqMWFgOl
bXLyf420lxeKCkOC6QiwVc4qoX32mocBSPD/VYw7F5OmMgtbNitSmCkEiVTLLfnFK2wH5hxKL0Xg
FwcO3kHMXU8guEYW45ZSSlV6I7mCYRUJkmEDDdopBAyFocOlWDNW7u8Ubl2qhLidTbE0mxENCWAG
i9DZCSBgkN9l+2oII2iJcHElwCBK2ZD72jMPCkJlEro0oiCoBmOmAoI1qmoGtSqCQQ91C3FCiwmu
LRRc6A6mkCPjK0OJyGAy5wCIa1qeQTDviG3UfDkGoL8PbhU97UB4GCldZkGUNga3zEQyMP4FYS4p
W0iaWCNTNKVnsWqoSoswY8fFwiFN3PhxpEnWBiclt0v67zwYI8kcLN1XAMDBwSNXKDEcRioGOTZ0
eLBrBygiitkPoKEHSnJTuiKjxCIOtqcGMAstpWG9ygKuy+hKRe2w8xHQTZpT0o1VbVq4wyFDdiIc
jjTfEJwil5iI3XhC3ChMZYCoYEAmpzV40iBXECyF0TtL/xDcpa9ABy7UItQlNgyvJrTpZvJvaIlQ
Q3RbropxEZ7HjOZ3a102uuNk66jVtmFFgnDMWqHURGGKL8uxHCryBxG3NcktDDKeey2UTrSCglBx
HEsWVGQNhE4wFtJAxIwMOI4Zyy9iWWwBgZB1DJemxerdqfeFvJn2pqkrdxqNhY5JoBLa5ZZqgqCM
1qDDVNKOuSIX+MLok+Tzn/1XUbPHDWG3UMLIu9lJgyWm0uxL1lqCN112FCdXCfmXIVdYnW6u81Sn
ZF97mwjikYCMgoIxK6SxvzCnn0DYttRe+GQajUBALt+qKntKJWVxllZUZ1SI0C+AVNZdY8LgjCcl
ILbsQt2AKqbSlIxxX5nITkJe8ThFkhK8WprEyYlT0uXEBU+LQst00K1jqNYdmC65grDfheljaEA3
YXxvw5islbYFpSA4oJrwg61hFWQtBwqSHiDiHJODikDiGCgNIVEilAYItwPyExzC4KzW5G2LX5A8
S2HYbLaQUqEgvLCd/38g4yWrbE020NuDuuEFk+gm0eDKWKacNRkm8O34GYzPRlu2f5YjGAcMohG/
/ELBYBYqsecqCI0CeETNsQFhNAcy7eTc4jQWH2suKMdg6GSF8j5/rENfxgI9mPl+G+z3UY9kozTT
h948O89tPQH0PeA9rTR1aQnU68i9J2DncHCzIRoswsD83/PWAXnuqUazQYJsEFy/Jfjhgqa8ldHX
MOSvQ68EKcpv64ckMbs+zzNBqaEK81fZY7WNfEmyDLG3X11B86Bs3g0YeeT1cLz51+Iba7JepE+m
MbfEM8EMDIE+YdgwF1AFaHHYl3M9LVirT7pEjDlUGWWRcw+SVct3KsRtmFQGS012bNnYW9JHYKtC
20JfQzXgk5o3gDjdx7YjpCzDps8qeEg4hUUpOkKteinQbyC361l5HNmGZlxB/YuLEjn2ylfcTII5
JbbJM+jOsM4Tw44mgxTSRW6DKGB7BRAEGKx1gSZI8/yF4CkNFWnLjFcCcEM8QnSCMlzBuiRWe7Hr
eHqEAIV8rxKSmqxBQIfAM+fXzOTNKPqowznJ/GqMJB3E1gv0O5oZe7o+8GYJh1DcTPQ3JQBGIwdQ
BqhWHu4OOM9sUkeRX7WbA+wmWOwGRmCwi04WJyDvSI6V5QysFDEST4DmK8/JMnzDoH0AYKg1Lf5i
9w3BYuWnQX9by0Cw6jeqRv5HcwSRL69g8QoFBLecqfFmcSs+RtCUA+usVZL0RoZBxgj4hj6H3DOh
h3DYdS0NmWDsWG5hEblN5eofVSuCJOXG4AtEvBEwaABab2GuATOezGHI3eV6rBp+QOHmF4F2SEiK
R2S6jCgEQqGCKD3Ca4cVzYKAaGv4BaFQTF7Cl+iEVTZgxTCIqBeqggFbkDhVwZZFPKZJHKu1eU4u
NMkwTYhgw6Dc4PR3+J8pTPeOsOkfAMahZ4HWCbSa0EeOsW0JaIJzOsUrUtVJ0KKpA13Km4Lg4CwP
IGGENAVtAqVS5is51hkYmmCUg6iKhSK0tIXOUbL1nFPmQUvTEdpxwoAM4c4ahpUaFScjz5zcToTu
bXbh1BgoDSx7jF3KsiDDAVxY6M4Gd4PWHItDLW0BhmTYEv/WCUxOaDBsbHgOswDOgSL6qChhYSIF
vqImIbD6z0hVP8RMlQIhzUCIbA3Hh0OMg+W8JhvDkE4Lkkt4xDl2haBzLoHRiz6FJgcLmB79vUmK
chHAPEW9eizW1adPwWdpUHcL1BnD1Sc0XsL3P4+BxGN7JBPibwWwgnkJZKJyDcFQd6eKB9U1GlK5
YeFKuqdKFahHIolmNInQJwrKklFREds1iXi8xI1peh0Mj0cfx8Eu5ArGGmJnIFkV2hqWo/r1f6H/
F3JFOFCQYy6uCg==


--===============3464945994119099625==--