From: Marc Alff
Date: April 14 2010 9:54am
Subject: bzr commit into mysql-next-mr-bugfixing branch (marc.alff:3153)
List-Archive: http://lists.mysql.com/commits/105619
Message-Id: <20100414095440.61AC941D6A9@MarcBook.local>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="Boundary_(ID_dTTD2oiJWXbDSyEm7C+3rA)"

--Boundary_(ID_dTTD2oiJWXbDSyEm7C+3rA)
MIME-version: 1.0
Content-type: text/plain; CHARSET=US-ASCII
Content-transfer-encoding: 7BIT
Content-disposition: inline

#At file:///Users/malff/BZR_TREE/mysql-next-mr-bugfixing/ based on revid:horst.hunger@stripped

 3153 Marc Alff	2010-04-14
      Tentative cleanup, test failures on 64 bits solaris / windows

    modified:
      storage/perfschema/pfs_global.h
=== modified file 'storage/perfschema/pfs_global.h'
--- a/storage/perfschema/pfs_global.h	2010-04-01 14:26:53 +0000
+++ b/storage/perfschema/pfs_global.h	2010-04-14 09:54:35 +0000
@@ -66,12 +66,13 @@ inline uint randomized_index(const void 
   value= (reinterpret_cast<intptr> (ptr)) >> 3;
   value*= 1789;
   value+= seed2 + seed1 + 1;
-  value%= max_size;
   
-  result= static_cast<uint> (value);
+  result= (static_cast<uint> (value)) % max_size;
+
   seed2= seed1*seed1;
   seed1= result;
 
+  DBUG_ASSERT(result < max_size);
   return result;
 }
 


--Boundary_(ID_dTTD2oiJWXbDSyEm7C+3rA)
MIME-version: 1.0
Content-type: text/bzr-bundle; CHARSET=US-ASCII;
 name="bzr/marc.alff@stripped"
Content-transfer-encoding: 7BIT
Content-disposition: inline;
 filename="bzr/marc.alff@stripped"

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: marc.alff@stripped
# target_branch: file:///Users/malff/BZR_TREE/mysql-next-mr-bugfixing/
# testament_sha1: 3a3d7dfdabb109c186177ff90655d3cc0216b4e8
# timestamp: 2010-04-14 03:54:39 -0600
# base_revision_id: horst.hunger@stripped\
#   pb8ucxndpa89ilmu
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWbixvTwAAZ9fgEAQU2f//3aC
HgC////wUAPZe3Yp1bGeXeLhJSaIm0nphGmjJpomj0NQ0aaGj1NqaBJJKafo00mCnkmT1A0HpGmj
QAABk1NEE1NoJtGp6m0QaA0ANAAGSjap6TagAPU0AAAAAABJTQQJinjSp5T01PGiIANqB6gyCrPh
r4JOvQ6IyZygxk2evRBwmJpzShNnjFxP2S4affINtLMwG7xNfxGl2ySdNidC9PCajPLwoiv3dhHk
2zTGGT5XazKwd1uB35OmqRsvOaN3W1mbQJxyVqRHaw5MKapz80qAXo64FgjXz3btYU/umsJ6gLjR
OFJULFQ4R0NjlVUJgBtgmTc9wJYgoxRRIgMJc6tJQAdg4v5b5xYja6Ip7CMxFy3Glips8ZH2bSlB
gOyQWy2UdhgYUPqD+rhIWrTN4lSnOzM0YFE4sMTkTUQgMOKr3j3/opFWLJMEX8ILOsc5IsGQMXlg
sSotipGvXgWDzypFc6/EiKpQtWB00V5XcwpKlXFjqispVY4W9CTKSLQrKrj9gaU+Zhq1UTm3JaXi
dsvWJWUm+66sk2ZVYpqyUCJmrFDVW5lHN8SQrk8rKlTEaqKcbFC0gEcPTMs+HgeThdHESji5i/k9
s9zE1hp9DfA15wvYHGu5wH1dE9iYmHP6db0ufebbdLq6bY1ksuwTP+cM/iN9IBSd5sJC3Lkf5u0C
60YKKV0AsP6Mivwv7+sgGIXHG1YDk4TWFh7HkcDCt5YfK3O10XC1CZ6YDN2mig1+dh4nASvjy4SM
BW7jSHQUvNKsGzLE9OqFqLzVMiGfHfdzZA3QubcPI0u3ngZd5pYQDubh9e6/jeUN1xTI29ltqz3u
CW0hkSdAk4CcFDKfLmcyYbHET2UAQNGNqDsOukTGeD1NZdvKPETAq8FdoNtamKQZhZStjR5Ui1qU
L2Z+RrIs0QnTUTThWsrxntDnD5z/tTt+cCSgDAuFcEV9TMVJKFuMsOl8oAIU4qCKjDiMGBHKrYiR
l9Ye4xlK5eIxDI4VnLLGScX8omiiUJmDfGpF0rHCGlYZGUyEQhkBeFxepFCsj0wKHsA2PI6gVA+t
y8WqTbjgztUBRRQsy1POGcGe1EZJhtlFueGgU4LivFkQc7CjjblxdSxhgE8+A2QxgagXMgzBjcpX
pBrit8K12FImADHtMx4ga7baDYcazVAIXlPrxRyo3HZGDSGkSDhLFWZZTZPWIhUAUASYRYpDTHVm
NLi+63ARrNSms3nMmm4CfGv+TxW9ytKxR6FUKIXXszQ36WhMGEkt0F/F3JFOFCQuLG9PAA==


--Boundary_(ID_dTTD2oiJWXbDSyEm7C+3rA)--