From: Bjorn Munch
Date: November 24 2010 1:30pm
Subject: bzr commit into mysql-trunk-mtr branch (bjorn.munch:2990) Bug#58171
List-Archive: http://lists.mysql.com/commits/124874
X-Bug: 58171
Message-Id: <201011241330.oAODUceE020388@khepri15.norway.sun.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0650583420=="

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

#At file:///home/bm136801/my/s_u_e-tr/ based on revid:bjorn.munch@stripped

 2990 Bjorn Munch	2010-11-24
      Bug #58171 server_uuid_embedded fails sporadically
      Fixed if condition to explicitly test for empty string as it used to

    modified:
      mysql-test/t/server_uuid_embedded.test
=== modified file 'mysql-test/t/server_uuid_embedded.test'
--- a/mysql-test/t/server_uuid_embedded.test	2010-10-21 12:36:16 +0000
+++ b/mysql-test/t/server_uuid_embedded.test	2010-11-24 13:30:12 +0000
@@ -25,7 +25,8 @@ SET GLOBAL SERVER_UUID= UUID();
 --echo # SERVER_UUID is not null
 --echo -----------------------------------------------------------------------------
 --let $server_uuid= query_get_value(SELECT @@SERVER_UUID, @@SERVER_UUID, 1)
-if (!$server_uuid)
+# Cannot use !$server_uuid since it may begin with 0
+if ($server_uuid == '')
 {
   --echo server's UUID is null
 }


--===============0650583420==
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/s_u_e-tr/
# testament_sha1: bbc1318af88bbd6a46ef547ac5664399f0c5fa12
# timestamp: 2010-11-24 14:30:38 +0100
# base_revision_id: bjorn.munch@stripped\
#   6n49gwndgw0p503x
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWc4DNUsAAXJfgAAQfOP/91sC
AAC////wUAON046T3vce93drYSSmRpPRNGQp7JlPVNPyNQ0T0gaGBkQJgKnqn5PUFPKaB6g9GoZH
qBhJTTQJFPxU9qaeqep5GRGeoJhDQ0BklPKbUDIaDeqBtIDQAAASiUMj0JoDQ0bUaPUAAACu6Leu
31K5LGN0He8QJ3Rdx1cZXy+PXHrVu8+tLMxZ6Hs+EWOXVslB7eW+7Dnw9s6ZY+tHH/UuasFjOVBy
OuhDoxq/CLpcIYgKvonZQgReojHcEQMllG42y2xggCxGEh5JT4NN20dKu2pFh36pAnEc4uAzEOKk
tkCNPl+DEa7UprIUrrhn91pHBE48HBeEPL2M+11hAVNalOQcDfa8lgkmf6c8HNhuLDXtVsBtLqxA
6qec1CIJaXGAcSoIEoMAFX8ApNoXRg5KtkA4Ziw4gvbEGooW5AuEy85bnTaLiHQV+v0FTZJHvoCo
DBMb2X2KSCGvTQhNC1Skt4d19fWjZyfVwoRsptkscbajKWcTuaaYox9uJpEWKpUQ19ZWqGA10BjG
6jew3vRzJbn0fEMhkk1jps9jJDOuhkkWhSJ1YG6o7ChqlHuVwgDoNv8Dxt+l9VLOaGXbnkkTFDDH
66E73yf6IUy62D0i5SdBPer2fju+NOOkUiF1RS/GW8TgpyPDbYlZN/OcqE04PcWfmoY++SkVR0A0
ISKqGYpFZ4WGkMpHHNpm1B66KWEFweiEjEKSRHda6BRCqXJ2qLBiWSIvGaV5ImWCoNRQ4DcSq+9t
ffn7sC7f8Vv0cXd19EraSapgs8t9NWxy4A623nBu6Ywa69tvBu/2kLgxifCZV8rXi3/VhYYSppw1
OTnmm7WWNnaeceneRNemE1zLWaO6ZZJGddva9Yq7MwYFgGytSjiO7U1O2s14qQNgzE6azDT6nBul
9QMr9saNjACwEh5W2d/+hjMdeZI35dBWg+cGwAoNYDoUQU2OkvUMRK3GxMq5LQhIIu9Z4Bdu1GdH
cl4/ZI5XltVmiNFIg28WiiaCvplUyRIEFMTuIzZ1IeyZZ7yq4Sehr3EvukcoAw9gCxhlbhu39Ts4
IhaH6coT2whR3GOMEBQAPb1EHItxwJ15UskoNe7wFBW3zuv24VxJf0v9fM2yMWJdIGedjz+4MYfu
xEwGJp3U1Ra8uj14hwS8vnuUJLKfvqGuaYiFC58HOnZTX7eHlyFn8YpFFROKhUis6lodua+orZCi
pmUNlQtnq3RYxeo8/+LuSKcKEhnAZqlg


--===============0650583420==--