List:Commits« Previous MessageNext Message »
From:Martin Skold Date:August 9 2006 7:28am
Subject:bk commit into 5.1 tree (mskold:1.2248) BUG#18184
View as plain text  
Below is the list of changes that have just been committed into a local
5.1 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@stripped, 2006-08-09 09:28:25+02:00, mskold@stripped +1 -0
  bug #18184  SELECT ... FOR UPDATE does not work..: Updated results

  mysql-test/r/ndb_lock.result@stripped, 2006-08-09 09:28:12+02:00, mskold@stripped +12 -3
    bug #18184  SELECT ... FOR UPDATE does not work..: Updated results

# 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.1

--- 1.13/mysql-test/r/ndb_lock.result	2006-08-09 09:28:34 +02:00
+++ 1.14/mysql-test/r/ndb_lock.result	2006-08-09 09:28:34 +02:00
@@ -64,17 +64,26 @@ pk	u	o
 insert into t1 values (1,1,1);
 drop table t1;
 create table t1 (x integer not null primary key, y varchar(32), z integer, key(z)) engine = ndb;
-insert into t1 values (1,'one',1), (2,'two',2),(3,"three",3);
+insert into t1 values (1,'one',1);
 begin;
 select * from t1 where x = 1 for update;
 x	y	z
 1	one	1
 begin;
-select * from t1 where x = 2 for update;
+select * from t1 where x = 1 for update;
+ERROR HY000: Lock wait timeout exceeded; try restarting transaction
+rollback;
+rollback;
+insert into t1 values (2,'two',2),(3,"three",3);
+begin;
+select * from t1 where x = 1 for update;
 x	y	z
-2	two	2
+1	one	1
 select * from t1 where x = 1 for update;
 ERROR HY000: Lock wait timeout exceeded; try restarting transaction
+select * from t1 where x = 2 for update;
+x	y	z
+2	two	2
 rollback;
 commit;
 begin;
Thread
bk commit into 5.1 tree (mskold:1.2248) BUG#18184Martin Skold9 Aug