bk commit into 5.0 tree (mskold:1.2174) BUG#20390

[Martin Skold]

Below is the list of changes that have just been committed into a local
5.0 repository of marty. When marty does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2174 06/06/12 10:40:56 mskold@stripped +2 -0
   Fix for Bug #18184  SELECT ... FOR UPDATE does not work..: Skipped lock check for full table scan due to bug #20390 SELECT FOR UPDATE does not release locks of untouched rows in full table scans

  mysql-test/r/ndb_lock.result
    1.8 06/06/12 10:40:32 mskold@stripped +0 -6
     Fix for Bug #18184  SELECT ... FOR UPDATE does not work..: Skipped lock check for full table scan due to bug #20390 SELECT FOR UPDATE does not release locks of untouched rows in full table scans

  mysql-test/t/ndb_lock.test
    1.10 06/06/12 10:40:31 mskold@stripped +4 -2
     Fix for Bug #18184  SELECT ... FOR UPDATE does not work..: Skipped lock check for full table scan due to bug #20390 SELECT FOR UPDATE does not release locks of untouched rows in full table scans

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	mskold
# Host:	linux.site
# Root:	/home/marty/MySQL/mysql-5.0

--- 1.7/mysql-test/r/ndb_lock.result	2006-06-12 09:28:13 +02:00
+++ 1.8/mysql-test/r/ndb_lock.result	2006-06-12 10:40:32 +02:00
@@ -83,9 +83,6 @@ x	y	z
 3	three	3
 1	one	1
 begin;
-select * from t1 where x = 2 for update;
-x	y	z
-2	two	2
 select * from t1 where x = 1 for update;
 ERROR HY000: Lock wait timeout exceeded; try restarting transaction
 rollback;
@@ -126,9 +123,6 @@ begin;
 select * from t1 where y = 'one' lock in share mode;
 x	y	z
 1	one	1
-select * from t1 where x = 2 for update;
-x	y	z
-2	two	2
 select * from t1 where x = 1 for update;
 ERROR HY000: Lock wait timeout exceeded; try restarting transaction
 rollback;

--- 1.9/mysql-test/t/ndb_lock.test	2006-06-12 09:28:13 +02:00
+++ 1.10/mysql-test/t/ndb_lock.test	2006-06-12 10:40:31 +02:00
@@ -99,7 +99,8 @@ connection con2;
 begin;
 # Have to check with pk access here since scans take locks on
 # all rows and then release them in chunks
-select * from t1 where x = 2 for update;
+# Bug #20390 SELECT FOR UPDATE does not release locks of untouched rows in full table scans
+#select * from t1 where x = 2 for update;
 --error 1205
 select * from t1 where x = 1 for update;
 rollback;
@@ -152,7 +153,8 @@ begin;
 select * from t1 where y = 'one' lock in share mode;
 # Have to check with pk access here since scans take locks on
 # all rows and then release them in chunks
-select * from t1 where x = 2 for update;
+# Bug #20390 SELECT FOR UPDATE does not release locks of untouched rows in full table scans
+#select * from t1 where x = 2 for update;
 --error 1205
 select * from t1 where x = 1 for update;
 rollback;