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

--===============1004826174==
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 12:28:47 +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
 }


--===============1004826174==
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: 9baf97cfb3b9ad929b4cc9755ed516f9ca99fd57
# timestamp: 2010-11-24 13:29:49 +0100
# base_revision_id: bjorn.munch@stripped\
#   6n49gwndgw0p503x
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWeZkMcwAAXDfgAAQfOP/91sC
AAC////wUAON069s872Pc53vewlEI0nlNJ5CeE1PQnoNEADQaCUSJ4mI1JvVHhR6mgPUGgABoMiZ
CamAhoT0JkEeo9QeoeiAJIplMo9pNNNQ9T0nij1NAaAADCSk0AaAp6anpqNqeU9Q2UGgAFNsF9aO
ZSzOpoe3+gBM2Da8lcjpOXhr8M2ijnlVVPbyOjnwUcueLo1X1zpdld32S039pMG9n1TQ3xeQYQrk
E4XzbfCy24dhX0Z875sNf7FZ8COhV2NCqFuowFc7ukUJCVixafxcmrXzEFEObAGAI4BG2hbD+JEe
TfnNVGI0WFjkJvDWD/D0bAi2HFgD1T7U7jw6Ob0BnaXi43YCakRxFaYNvTWTPqUTFHyvCXlUnY1h
JRsK6PMRMNFYGwA0jmFIONJ4zVw+/IFmngoGy4PnQWHTY+qI1Up5kc7mlZL0m5+4W2pCqrFMJgNK
4ze2UWGSi2oLkPcrX5o0dZMMarJbrrXztfSSE4i2MJ2nS44XXudr8DSItBWsCsJv3lqaEMq6g80C
G5QBDOW2NWWmlglS9ETTLGoUjcZIuCkMtaBtSPNQylIuriQDXrnxOVVeqnKrVfh6YYIhKRUU+N5M
5zPyAZZJ1Dyg1GbxNrgrmk0t68NfCCIPmMJ3OUJcDjuppl+t06HbaG/PE/LDNrLSkmgJA0JsQyMx
j3wyLMHKV0F3A582IUxoZki43JE9cI4pmXE1WOmOkkrdCfGKUu41kqicIgwyItwzWQT3hRzu/WAm
HXHxZDHHCvSuLIxDlVHsoalgWarnrskS3THNWsejCwNkDqipLX2uEz3qJqtkRZgyNRrjjtnLyw88
l6OmI8bpbFSPARVbhs3Id9HsJX68adabjLRgq5sBMw4K6I0rJcUFu2ULtqMDWVZRlfEfVsA/upuC
On5vtfkiCgJS+i7H9iurOXckb49hkoaYBqK8TowsE8E7QylSGG2VV2L0GUkzGOrEcRZCfJbNQU4S
Nk8IEeDwSM6OGh2dIbcmKYWUskOGSiOUR2yRBky26yXKJQQ2ExH+SL5wmX0CmmSE9tXdemmxVRxL
ovfGp78uYSW6FVSAwA28iaRCGygRnylUSUW5mQFDVyjS7K6eAf+i3t9A2SXqH4gQ62nR7fu1CAVL
snGisly97WZmoW6GmDBYPj0WldBK2OIg5aQtbGxQ4VW8Ra4Cz/sUh1JILkKdUCt7zAKOw2g0UuMU
wkBPZTdBRe0w0f+LuSKcKEhzMhjmAA==


--===============1004826174==--