List:Commits« Previous MessageNext Message »
From:Jimmy Yang Date:October 11 2010 7:36am
Subject:bzr commit into mysql-5.1-innodb branch (jimmy.yang:3624)
View as plain text  
#At file:///home/jy/work/mysql5.1_7/mysql-5.1-innodb/ based on revid:sunny.bains@stripped

 3624 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/innobase/row/row0sel.c
=== modified file 'storage/innobase/row/row0sel.c'
--- a/storage/innobase/row/row0sel.c	revid:sunny.bains@stripped
+++ b/storage/innobase/row/row0sel.c	revid:jimmy.yang@stripped
@@ -3628,7 +3628,7 @@ shortcut_fails_too_big_rec:
 
 		if (err != DB_SUCCESS) {
 
-			goto lock_wait_or_error;
+			goto lock_table_wait;
 		}
 		prebuilt->sql_stat_start = FALSE;
 	}
@@ -4408,6 +4408,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/jimmy.yang@oracle.com-20101011073615-7plkcewvq73u0aue.bundle
Thread
• bzr commit into mysql-5.1-innodb branch (jimmy.yang:3624) Jimmy Yang11 Oct