From: Bjorn Munch
Date: February 9 2011 3:25pm
Subject: bzr commit into mysql-5.5 branch (bjorn.munch:3326)
List-Archive: http://lists.mysql.com/commits/130890
Message-Id: <201102091525.p19FPfg4010776@khepri15.norway.sun.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0730522360=="

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

#At file:///home/bm136801/my/main-55/ based on revid:joerg@stripped

 3326 Bjorn Munch	2011-02-09
      Silly mistake in 59148, forgot .exe on Windows

    modified:
      mysql-test/mysql-test-run.pl
=== modified file 'mysql-test/mysql-test-run.pl'
--- a/mysql-test/mysql-test-run.pl	2011-02-08 15:47:33 +0000
+++ b/mysql-test/mysql-test-run.pl	2011-02-09 15:25:34 +0000
@@ -2022,7 +2022,7 @@ sub read_plugin_defs($)
 
   # Need to check if we will be running mysqld-debug
   if ($opt_debug_server) {
-    $running_debug= 1 if find_mysqld($basedir) =~ /-debug$/;
+    $running_debug= 1 if find_mysqld($basedir) =~ /mysqld-debug/;
   }
 
   while (<PLUGDEF>) {


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

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: bjorn.munch@stripped
# target_branch: file:///home/bm136801/my/main-55/
# testament_sha1: 9c42d86cd6334fbe489f3bd1d0c50347c89d23f7
# timestamp: 2011-02-09 16:25:40 +0100
# source_branch: file:///home/bm136801/my/mtr-55/
# base_revision_id: joerg@stripped
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWXWQ/cUAAX3fgEAQVGf//1IC
CIC////xUAONq81s3eg3d26wkoTQmk2Cp+0EYpppPTamo8po9QNoGVMQ0xDUMTQAAAAAAyCmIZTN
FTelPU/STyZR6IMmTQGBilPTRDQZGhoAPUBoAAAlEIap+p5CmbUTDUep6J6gaAABs+Bd+OpEXVqu
d2sCEIOtia+dN1fur45bGDGfnqo4pN7G4IKCLeFWH3p37/H0n+ItFf2pE/58P01d92ZVAeXY+u+i
XBYIoic4FxVXDSLaRaZgC5KFGAme64EdkokhTPqQDXcV4iiAh8h5hQRa5XAfSDuEIFpUpnBmuJ1+
rgjhkFIrqYCJDGVQoYGMeIFxvErnmZDR2KVeJkEsG2ZZY0t42X1lcJLpm0VLxKeIJqSpEGgqilwm
wTOwdFQ1tMpDrBpNgmvNXtV8Bs2Er5CSpnFoN0Ywyx0Eb/SjCOAAiWKio1gGer4CWpsgUZHE9gZt
In4bCl8Sk0UPAUcItDdWugS9K4T+iO7dIz7S2we0VKnpixRxvtFpKoIoP2QXGi6ybGtJ1yylwpbQ
ErShbLA23GWV1l8g3AppJzR1Bt4UOVwgLBo8YIwWebvW5YKQodSkEcRAhFPKvePn0uprgqBI9LeV
p5dCYzQoe+DYMWqNdCEu+DhQ5i7oJo/pqxyAd0mZoXU4WMdLfMjZKvLEzKX5H6Y5YmQzb22Ngdy8
vzDCki5mwpUrzOQL96wxAB4NBIkkmKfUClxsjqotKhiWUQFuofb3obvO1Emm4Uz4irng1Bbqt57S
cTrdNHT1lctk3gV+lHSn1a11AOovPpwylsbZQxlHDlhVqjZF/GnMyTFXTCGSpw6Y0RjGEwYef3iT
47inGlYjnmnGYvYuJD0Kk/gh/iosFo1w0XcaBgEJOK4ZUqEZkoXqcqm5Jk8sIE5evd48t0B/evZN
23WvuB+0Mx29pmaEq9V7dEvO8s2hwyTeGAWhawMUcWwAWKuzXdTqk5B4bxBWicQtnzN0GkOG38iU
YDMnd4/87fLtOewYzVFJYqOwIMW2IlOB5iBgihsiFs5CRRfpjcDMAazhvQocJQBsDXrCYDfEs6qe
O7yVlWLGKIfJitdserqMQSC+PHddYdBQA87CL+dREwCcFJGi18BZZ1QHmxdslnWgkl+IK8zrjivD
BAij17YAwcMsr3WjGVGxwyWXKppFolbuvDgXgIGU7GGW4ceMT68SVj8pCcry56iJWdcw5WXNXhWw
eX85kGY2DuIoEk3sL/fIu5IpwoSDrIfuKA==


--===============0730522360==--