From: Marc Alff
Date: September 7 2010 7:22pm
Subject: bzr push into mysql-next-mr-bugfixing branch (marc.alff:3274)
List-Archive: http://lists.mysql.com/commits/117731
Message-Id: <20100907192247.2949F45E81@linux-su11.site>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============3949936519564346437=="

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

 3274 Marc Alff	2010-09-07 [merge]
      local merge

    modified:
      cmake/dtrace.cmake
      mysql-test/r/partition_not_blackhole.result
      mysql-test/suite/rpl/t/disabled.def
      mysql-test/suite/rpl/t/rpl_delayed_slave.test
      mysql-test/t/disabled.def
      sql/binlog.cc
      sql/rpl_slave.cc
=== 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);
     }


--===============3949936519564346437==
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: 9ead52898e69e66a524984062c860276c7699c05
# timestamp: 2010-09-07 13:22:47 -0600
# source_branch: file:///home/malff/BZR_TREE/mysql-next-mr-bugfixing/
# base_revision_id: mats.kindahl@stripped\
#   z65nvzn1nf6cpzn8
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWXyghbkAAnXfgAQQWWP//3Ii
FAq////wUAVM96De1qd6vL3c7ZQqhKIplPJ6KY0T9GpoGhqZPU9RoAGQGU0ppsTST21TT0mpkeSA
ADENABKEmTSNPRNT9RNDyQANDINBoaBIkUwFNlR5qnspHinim0mnpMjQGgBJQTEammNU8mjQTJT8
qfqaRp+qNHqNGZRnDDRnqU9eZgO/sgtTwfHmhkQgoGKVo0jg5o51CNZPgkqqm3zDc6D1K8Q5VcMz
l2Dyzdv2enroHr7wH20/DXfaxHb3I5Sl66KJVWmF+oGmwl3XdyX7azcCGBEerqHAPmZnIq4jTQ+x
wNNfntQb1vfr31YpL3C8LxA96yjTOIs28aErh2l8kI3HD0AjAmnJBsraoMQVDN1ShDBVBiMJsDVA
ERK5IYiMZwHloPYKAP5jIMQj6MK9oWcT/azs82wOP1mTMaRLdgRsIoMcdiKBD7lxg6BaQG010m3n
vWZWD9fgZqmhrNV1+bRvFNyoxWAjHZQHD5KxaMTDuooHkrV2MqySHizwMTpCoyQYoOa9yrhl5WYI
LEw48HQR+Uyuik4E8vLvi9AhN1lnFjKYQkuFEFQM5GDmTCZwKSDVL6Q5gechUYjYOagBc8oBkFlW
2kyNgRzHBWKag4w/fmWGlZqLZBieVOBWeVwWKtX+410x0RGg5IzQ1tYP4rVO0TAgLzgtN5zDFyrp
OwgRtrIDMKsxgcV035mYvfJ7qriSFmeD2LtN8tKBjyRskliCJAoGmQLK5xGWTYIHqKo5+g3oMpYa
ADqahZJAkOQyZ4PGoCxmprLhR9RJSPVC0cisNUWjVlQsB8EJJWPSI6JQgpAWlKRI0ijk160zGoli
ngSZn9XxN2aD1JiqpVpXcxtMf52xOCZv7qjClIq23X2hijJZi+jSSIahc8+WxY9fBllwgY0kUdtX
cpiUJWrk0Hb0SWygzyMayzn+iaS2ekDpJFTXV4BdU5zIlfZdm2Bxpvl9JDibivtEgMRURJZ1Ns2M
mvJ5w718fHkNOfNGdjhg0QdSdBIyNy3LrjQ/PbrIjtjdRcXh6SRRxVUGC7dqlkgitl/UzraqDSY+
Wvywssri08+pECJ7mLqqQMg2EeYG8q2yLrq0HG2+YXgKyUibJvWb82vCqHELdCBRdjgI9jYC5ED3
bw0DRayo3DoKEX7uu840mUFXAr0DZNBASaWopDvoNpmY4kVi+oQYICa+2nc3ny5E34MXQwGD+rD1
CGiBjzh61DbFol33E3/ia60CsitEFe8Li81nwDCJdYmWtMAPJ3oGJ1I74zlJGf0JlRN/I3ojzIkW
zSGhg0DOewzFvVVJT3mQFiUyANKn3JnI6hAw6X+5MAoZHI8Bt4468D0uGg0ETozash4/09j2GWgw
a3kPQ1V3n5DjMJS6Fp81aWElUUscfecW1cEQfETwZTYtCCRYdFIIMK/9OtIbQxZJmMMg2N1efN4C
igvIBL4EHZJovDRUKstpNeuWyoYxECCdE+qCzZ3IhCRd5kSi/T6IN2CcZ3XlQNQLuPEFrAGeJhrO
w9SDnWKUc3jSvaOCJGA5onaPXyUSTryonAIndBtu6MGMt+LLEnTOtjdnZzdykh2Ct95wCWMjgQRj
IvJQOLjUchhEjzKwdFKSTBqe5FDYUvQNP83rQkWBsZP+VWi4WEJX71qDQqEexr5hrjWtNpr7VX2Z
zHeKgMZC5J9A6HYkgasWp9h0Wike2Z/4u5IpwoSD5QQtyA==


--===============3949936519564346437==--