From: Jimmy Yang
Date: October 11 2010 7:44am
Subject: bzr commit into mysql-5.1-innodb branch (jimmy.yang:3625) Bug#57345
List-Archive: http://lists.mysql.com/commits/120471
X-Bug: 57345
Message-Id: <20101011074411.639996AEA5@jy-laptop>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1713859591=="

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

#At file:///home/jy/work/mysql5.1_7/mysql-5.1-innodb/ based on revid:jimmy.yang@stripped

 3625 Jimmy Yang	2010-10-11
      Fix Bug #57345 btr_pcur_store_position abort for load with concurrent
      lock/unlock tables
      
      Fix approved by Marko

    modified:
      storage/innodb_plugin/ChangeLog
      storage/innodb_plugin/row/row0sel.c
=== modified file 'storage/innodb_plugin/ChangeLog'
--- a/storage/innodb_plugin/ChangeLog	revid:jimmy.yang@stripped
+++ b/storage/innodb_plugin/ChangeLog	revid:jimmy.yang@stripped
@@ -1,3 +1,8 @@
+2010-10-11	The InnoDB Team
+	* row/row0sel.c
+	Fix Bug #57345 btr_pcur_store_position abort for load with
+	concurrent lock/unlock tables
+
 2010-09-27	The InnoDB Team
 
 	* row/row0sel.c, innodb_bug56716.result, innodb_bug56716.test:

=== modified file 'storage/innodb_plugin/row/row0sel.c'
--- a/storage/innodb_plugin/row/row0sel.c	revid:jimmy.yang@stripped
+++ b/storage/innodb_plugin/row/row0sel.c	revid:jimmy.yang@stripped
@@ -3748,7 +3748,7 @@ release_search_latch_if_needed:
 
 		if (err != DB_SUCCESS) {
 
-			goto lock_wait_or_error;
+			goto lock_table_wait;
 		}
 		prebuilt->sql_stat_start = FALSE;
 	}
@@ -4559,6 +4559,7 @@ lock_wait_or_error:
 
 	btr_pcur_store_position(pcur, &mtr);
 
+lock_table_wait:
 	mtr_commit(&mtr);
 	mtr_has_extra_clust_latch = FALSE;
 


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

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: jimmy.yang@stripped
# target_branch: file:///home/jy/work/mysql5.1_7/mysql-5.1-innodb/
# testament_sha1: bc356b27a224fcd3a73b859c2e389f6824cd7c95
# timestamp: 2010-10-11 00:44:11 -0700
# base_revision_id: jimmy.yang@stripped\
#   7plkcewvq73u0aue
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWTUWE5wAAkNfgAAwWnP//182
BCC////wUATN7Xu97zJPZdoG1dHCSSEein6QJ6aZNpJ6p4EmagbUNDE9TQSkJpmlTw0KeUyNNAZA
AAAANCT0mk0eoAAAAAAaAAEkhA0TSBp6nqHqHpPU9TTQ0NAAGgkoBJgBpDSNMiMjTEwg0BiGZiln
O+/j9f4S4tkYuPP2J+l91sYKRq5KUKiJje+aRr508osYSoJjjBmDMdpCDoGvivYFCmcKIxFNkfwS
fc52D6zz5ZFx+qIeg/bMcxHTIaESeF+Yz2yfyjTtSaxLef0gsZuJefH1RZA9+9CwynsjrjW1HYjC
OPiBg7hRbCkOIlxIgtCZW6Br2FNVdAi5qa6xyOre2LRwyEwkXIaSeA4cpiVDlhKkbROPB6xjsVAo
c3aQMTQDfAZIqE2JEhZaUbnPxJCZKMyAAtUsiM5r3qhdMUQwzzpksoIZqnuYPjlou/AuTVVYjrTR
4oasl/hc4aQgMjXoolNJa2RrudwlEmmHdm8yAdNT8RyStRi0UZM8kGPIZEbGVFoFcspkaCQFpwux
HLhUUo5iRUqeFQ82AwMCouI4FL1KsoaNvDMZeOIlV48UB5JqSyJjHRvYRoZBIWkCtCqSsYfyo+nd
wJDi3SlEKBwp4F96GApaXXkkMiNcbClG6XFZqv2IzfRjUFFpjIciJcRAgRjRXsx1IuIJpmmga1e9
GBkjZA3u1wpniHaa9FsiibXIrtjTmSMGE1ymr6LcCBLVmoHT2CxBXMK0K8XQsLCwjrA5pVVo1slN
x9aspeGJXQFLQZFlKKhFWKkt9MW4zTUs2ge9rrzTuFasNQL1orZmGZvbKe5VxyxO/Ch6VDoJpBjc
mYtajqGHR3vB52EB4tDl0RmSHcSB4UhYcTuoEplnHVfBHebzulMsivXpBZq+d6XpWjNdOhLNzmYt
YZkNjjIPKhcirXYXpMUoyF+knIov+PNEyMRkRHy3rZ3MQ2hIw4SzCXb28Ijy2A8r3Yz2mI6ZhurD
WBSG4HbSKM+5GBoYNRktxKXDqEHjqqNlUnyLaTLad5tHvbkzoKkZHIcZeunpn4GF7rINhfWE81TZ
/044mhGJMDa9VdF9ZWX2lCK09EAJexGjAax11TiorRz4yyq6YzL0InIpIuCg27CVwwLMyZHLSVlw
vVfCiUnApFg8uIcP8hpblqE46+4KruRB/WzPLOVI3kDgiw8iY3dFSBIcYL8m9MOy3KxMjEoHQC1G
tecQKUY3C3E4kwbgo8FbhcZRnjR1TZxLWbxtqA7IWyuQoQUEJnwSoJE0chjGgG2xHs+04AZAOYDF
WBzc8GHiRliA02xSAWJKKTGeQpPoSqScrS16Y3dcyCJZv2MGBvHKW5anmzST/DpXNqI6K81HWQSD
FMMCSVfC5JWvSCbYFVEzUkeNpqmKbDFRiNDIde7g6guaxLCSKBpQTYdOokiAzDGY0pHNPUImRc6p
wdFBRbTUPPIB9KVa2jIqTQl4rCleZxktCr3Bmlfc2xPzR2KAGsmPWCYjdPnuGAmPA6wUQH1gaW1T
K8f/xdyRThQkDUWE5wA=


--===============1713859591==--