From: Marc Alff
Date: September 3 2010 1:38am
Subject: bzr commit into mysql-next-mr-bugfixing branch (marc.alff:3273) Bug#56523
List-Archive: http://lists.mysql.com/commits/117474
X-Bug: 56523
Message-Id: <20100903013832.4D5DC45E80@linux-su11.site>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1309424163367208213=="

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

#At file:///home/malff/BZR_TREE/mysql-next-mr-bugfixing-56523/ based on revid:wlad@stripped

 3273 Marc Alff	2010-09-02
      Bug#56523 Instrumentation regression in myisam/mi_rprev.c
      
      Re-instrumented the code for the performance schema.
      
      This fix resolves a build warning caused by a merge problem.

    modified:
      storage/myisam/mi_rprev.c
=== modified file 'storage/myisam/mi_rprev.c'
--- a/storage/myisam/mi_rprev.c	2010-05-07 08:04:15 +0000
+++ b/storage/myisam/mi_rprev.c	2010-09-03 01:38:27 +0000
@@ -72,7 +72,7 @@ int mi_rprev(MI_INFO *info, uchar *buf,
     if (!error && res == 2) 
     {
       if (share->concurrent_insert)
-        rw_unlock(&share->key_root_lock[inx]);
+        mysql_rwlock_unlock(&share->key_root_lock[inx]);
       info->lastpos= HA_OFFSET_ERROR;
       DBUG_RETURN(my_errno= HA_ERR_END_OF_FILE);
     }


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

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: marc.alff@stripped
# target_branch: file:///home/malff/BZR_TREE/mysql-next-mr-bugfixing-\
#   56523/
# testament_sha1: 64631cafc61cc1fee791552fe3fb8e93768f8acb
# timestamp: 2010-09-02 19:38:32 -0600
# base_revision_id: wlad@stripped
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWWcI7WsAAYVfgAQQWWP//3Ii
FAq////wUAPWy3tZuN1ZckgklBoFPJpqnmmmjSm/Up+qenipkyaGj1GnqDIlGJ6GRppqJmk8oDQA
GgNANNTQymhMI0kxk2pMjAEaMCPIcwAAAAAAAAAAJKJpiRhqZGSbVN6ao9TzUjJ6mmmQGQu5sNep
PXgO28RMYaHAimaQZmkumwq2FtSIg3+R+s01LVJVYeT6Pjf5fvz1iR9JyvY4fJYLvUKROR1xte7k
6exIFFfyrv6feg6iOMsaq15m3CK8g6/u+6n42iuhuhsS/wVBUk21qIZd/NwntOQJD8BFJCniktVY
woi5z1FsB1WSCCgeiFGrktoTNYlEHgQ/2D7fisLFmvtyp5uJgbbLjn4VV5xSLH17qVy1m9jvEJSE
a69Bal1lAIuirnqKwYmaJ4nFPPZGDg22G4zfPaK0WS9ifLbbIDZyV24YO6aZi/bvUI2xl1Vy5YgZ
C+S82lOZNghgkplwqkczM9+2JGreUsJPVbSzxzoOES8hcWe4gVqpkYDkMKEFbnmgaTtlVITQOIMK
AdChEcGB+qxVDWSnfUbTslsBnpaXKKQa4uKaxXM6h9hzFAwgLVEKwIBqi1hmBPnjcqGD04qGUqKJ
VvFC5YMA7FU7+8YdeifprhY3euHG1KRynomTDe3CCKCIw8JdUiGbvy05hycTdxpZgSrkNfS/s5+S
VScxM9lZGh+8WaWyMt22SzZ9YktlaNIVLnllPPr7O9X48jbzD4QJkptGMqijQm+cl3lxFwwjcxAp
OQbaSI5HKFg5pV8QZSHPOM5VheYAwGJc5pUNHufRZFv1wn4f2AGp7MbhdhNf1n8dOnE05x8OjGve
Q6NkaHY4PuS2/Hbo3WySfeoutRovHYVLsNVeU8lox0TsY4TQmYGyC7344HIubMgkBqP12aGXdkWO
kw0kNFi0dwob8syCc3o8LiiL3xsUrh4peAaiunsmk0eWcFEWlNoaqN1Htfa7td3MGP2MQt1kffyw
TCY6bjeEHnhgFATNCbuTDkakmGdftWBI29uMqa86hgiiw6kxEY5/0egPLsilVw55awz7hb2JbRxL
Gi/6tiRYBCAuM6hEBaoIdDcIuiEoQMJaU0wpu2xARgnhNH4InwQ0OrVInuv1rp9N07GJ48mh5C1b
uZAHxsyIHy7xb5ExhXZOmgujkFLEM66gq+LiK40BGF7htGBMDNMLBF4+pGDtfIVt+QnFdmRbwqqA
Wg4zTp/BsCoaAV9QzAXJc4QyUXLAwsxHQQzbqgrIHAIjBMchjeE0/OJwiUBezX5KhFKk0LOKnRja
21UxLfwtfLe5lQWxXapszkPE02W0D/S4/4u5IpwoSDOEdrWA


--===============1309424163367208213==--