bk commit into 6.0-falcon tree (hakank:1.2647)

[Hakan Kuecuekyilmaz]

Below is the list of changes that have just been committed into a local
6.0-falcon repository of hakan. When hakan 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, 2007-04-25 01:38:45+02:00, hakank@stripped +2 -0
  Extended test case falcon_bug_27997.test a bit.

  mysql-test/r/falcon_bug_27997.result@stripped, 2007-04-25 01:38:42+02:00, hakank@stripped +13 -0
    Extended test case a bit.

  mysql-test/t/falcon_bug_27997.test@stripped, 2007-04-25 01:38:42+02:00, hakank@stripped +9 -0
    Extended test case a bit.

# 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:	hakank
# Host:	lu0011.wdf.sap.corp
# Root:	/home/hakan/work/mysql/mysql-5.1-falcon

--- 1.1/mysql-test/r/falcon_bug_27997.result	2007-04-21 16:55:13 +02:00
+++ 1.2/mysql-test/r/falcon_bug_27997.result	2007-04-25 01:38:42 +02:00
@@ -12,7 +12,20 @@
 5	NULL
 UPDATE t1 SET b = 2;
 ERROR 23000: Duplicate entry '5-2' for key 'i1'
+COMMIT;
+UPDATE t1 SET b = 2;
+ERROR 23000: Duplicate entry '5-2' for key 'i1'
+COMMIT;
+UPDATE t1 SET a = 3, b = 2 WHERE a = 5 LIMIT 1;
+COMMIT;
 SELECT count(*) FROM t1;
 count(*)
 2
+SELECT count(*) FROM t1 WHERE a = 5;
+count(*)
+1
+SELECT count(*) FROM t1 WHERE a = 3;
+count(*)
+1
+COMMIT;
 DROP TABLE t1;

--- 1.1/mysql-test/t/falcon_bug_27997.test	2007-04-21 16:55:13 +02:00
+++ 1.2/mysql-test/t/falcon_bug_27997.test	2007-04-25 01:38:42 +02:00
@@ -25,11 +25,20 @@
 SELECT * FROM t1 FOR UPDATE;
 --error 1582
 UPDATE t1 SET b = 2;
+COMMIT;
+--error 1582
+UPDATE t1 SET b = 2;
+COMMIT;
+UPDATE t1 SET a = 3, b = 2 WHERE a = 5 LIMIT 1;
+COMMIT;
 
 # ----------------------------------------------------- #
 # --- Check                                         --- #
 # ----------------------------------------------------- #
 SELECT count(*) FROM t1;
+SELECT count(*) FROM t1 WHERE a = 5;
+SELECT count(*) FROM t1 WHERE a = 3;
+COMMIT;
 
 # ----------------------------------------------------- #
 # --- Final cleanup                                 --- #