From: Jonathan Perkin
Date: July 5 2010 11:54am
Subject: bzr commit into mysql-trunk branch (jonathan.perkin:3092) Bug#54991
List-Archive: http://lists.mysql.com/commits/112880
X-Bug: 54991
Message-Id: <201007051154.o64MNFUi026100@rcsinet13.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0668003232=="

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

#At file:///Users/jonathan/bzr2/mysql-5.5.5-m3-release/ based on revid:alik@stripped

 3092 Jonathan Perkin	2010-07-05
      bug#54991: mysqld_safe reports syntax error and skips part of logic
                 while restarting server
      
      TARGET_LINUX must be 'true' or 'false'.

    modified:
      scripts/CMakeLists.txt
=== modified file 'scripts/CMakeLists.txt'
--- a/scripts/CMakeLists.txt	2010-06-30 17:47:42 +0000
+++ b/scripts/CMakeLists.txt	2010-07-05 11:53:03 +0000
@@ -243,9 +243,9 @@ SET(localstatedir ${MYSQL_DATADIR})
 
 # some scripts use  @TARGET_LINUX@
 IF(CMAKE_SYSTEM_NAME MATCHES "Linux")
-  SET(TARGET_LINUX 1)
+  SET(TARGET_LINUX "true")
 ELSE()
-  SET(TARGET_LINUX 0)
+  SET(TARGET_LINUX "false")
 ENDIF()
 
 # Use cmake variables to inspect dependencies for 


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

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: jonathan.perkin@stripped\
#   uokktu9q2nup3ah1
# target_branch: file:///Users/jonathan/bzr2/mysql-5.5.5-m3-release/
# testament_sha1: 8b2fee1eb7807633fbf955a103e08a05e5032125
# timestamp: 2010-07-05 12:54:06 +0100
# base_revision_id: alik@stripped
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWbeJaQMAAYRfgACQWOP/93q3
XkC////wUAPW3ndG3bmDDqwSSmk00xNGhhT9QyFMwUABtRsU2p6QZJT0ZGjQnkjRPSaAGho9EaAA
AaCaJkRNk0yajQ9TQANAMh6gAOaYmAjTAjCMAAAATCMBJI1Bpop5T0BqmaZR6TynpDIYgADRXtDN
OE9Kx/RhgsC5uR4IjdLcpaTKxVlR1iza2L86Ihw2AYvloVI40M1NHjEJ4ftFGH95+lPE+N86/c4Q
YScozppwd8tMi4KBszAzTQjjkNMVyHqI9XFJi8IrZ1/ddL4BadeisfNNMkwFqxhJ7XSZmsGQbPYo
iPyPYl6gT3OyQ8blwVCczFMcS0BiKbVAR1e/Wad+RSHgrka4TQZFiSB1NggWyyfdDQZ+eIycSFwS
UKblDo5nCNtiagCSRccirIcuNg4OsEbvqrPMCUMGp/AUtNoNedgML76ZVB9EuMSrCCd+QHRmDBSZ
y+YzBdcSuN5U9EGi9mINkrIR4XDN+cIYvSN+wgKScG01YRuqhbobfUxqgqqD1ilzjFyTcgbOhIQa
SsKnskoc4q0jINRnmGJMMSuyHwowmi2oe58kxFV2LZQ5gXVnTp/wqZvkRgKcrJGqClRCCkcDeHAP
gfWLLbonyVknD4aGAPJcFFKyY5Ru7H8XZdV7+6i6dVm6piY5k8C7LuqFlsmR3d+Tm8iuoaHrf3Hf
xAqLLCIdgv7uPMvDtOe7BBK7vqBke4NICYsHwGq3EE6Qgo7RTjFmWF5GvBMwflDbRuGCNlyueUQA
XjcSK9Dlozssk2TCMgcwsKKO3ZvS2vHSXFx9s0vTlHhe1D8zM5A4iouMMMdrr7q22QfeGQLoJTnL
Y/FZC0r/O+7A2TrAbsYxzTA16nLP30gbmdt0vJURRp2mgzqFbq9XLndZ7osBxMGM7XUWscC8byHy
34UPqtxwibOFaCUm9tGMLxbrpVvg2Xj5po9h0KDgtPFiI0bUKh35uqhsCKh4fvCbq77vh8TxJuhv
GgxZ7Cs1LWsiDpC/0JYrQL25woDPAI2EwGzM9qYbVw6IkrhG3CEyC7jGrRcYyUqKCbNSRe1QAgRA
Z2QRIhBinK862TsuIoLRuwnjcLDEFWHlvA4SJN5AdYWrkQWfsNexYCsyZkznwAq5ap114nLtE50X
F5KZuoVagFfvMQqGO9BNp3EIDnkVDZdt++VCHAQCoT1UwrGrw5qNpK/mYoq0gzyNrceLby3WxmVo
TW5Qnzl9MLi0MGRRO8Ku1MMrFAEM0pwbgIlEHk1NY8kYslorViFVEZ9eBPFIKBxq0bMNd9SWPBrj
aWEVfs+OvJlpUKxjp14p91dR+PkoVCMp32FU9jx//F3JFOFCQt4lpAw=


--===============0668003232==--