bzr commit into mysql-5.1-innodb branch (jimmy.yang:3625) Bug#57345

[Jimmy Yang]

#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 @@
[phone]	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;
 


Attachment: [text/bzr-bundle] bzr/[e-mail]