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

[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-30 22:17:27+02:00, hakank@stripped +3 -0
  Added new test case falcon_bug_28165.test.

  mysql-test/r/falcon_bug_28165.result@stripped, 2007-04-30 22:17:25+02:00, hakank@stripped +21 -0
    New BitKeeper file ``mysql-test/r/falcon_bug_28165.result''

  mysql-test/r/falcon_bug_28165.result@stripped, 2007-04-30 22:17:25+02:00, hakank@stripped +0 -0

  mysql-test/t/disabled.def@stripped, 2007-04-30 22:17:25+02:00, hakank@stripped +1 -0
    falcon_bug_28165.test currently hangs.

  mysql-test/t/falcon_bug_28165.test@stripped, 2007-04-30 22:17:25+02:00, hakank@stripped +40 -0
    New BitKeeper file ``mysql-test/t/falcon_bug_28165.test''

  mysql-test/t/falcon_bug_28165.test@stripped, 2007-04-30 22:17:25+02:00, hakank@stripped +0 -0

# 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
--- New file ---
+++ mysql-test/r/falcon_bug_28165.result	07/04/30 22:17:25
*** Bug #28165 ***
SET @@storage_engine = 'Falcon';
DROP TABLE IF EXISTS t1;
SET @@autocommit = 0;
CREATE TABLE t1 (a int, b int);
CREATE UNIQUE INDEX i1 on t1 (a, b);
INSERT INTO t1 VALUES (5, null), (5, null);
COMMIT;
SELECT * FROM t1 FOR UPDATE;
a	b
5	NULL
5	NULL
UPDATE t1 SET b = 2;
ERROR 23000: Duplicate entry '5-2' for key 'i1'
UPDATE t1 SET b = 2 LIMIT 1;
ROLLBACK;
UPDATE t1 SET b = 2 LIMIT 1;
SELECT count(*) FROM t1;
count(*)
2
DROP TABLE t1;

--- New file ---
+++ mysql-test/t/falcon_bug_28165.test	07/04/30 22:17:25
#
# Bug #28165: Falcon: hang after select for update
#
--echo *** Bug #28165 ***

# ----------------------------------------------------- #
# --- Initialisation                                --- #
# ----------------------------------------------------- #
let $engine = 'Falcon';
eval SET @@storage_engine = $engine;

--disable_warnings
DROP TABLE IF EXISTS t1;
--enable_warnings

SET @@autocommit = 0;
CREATE TABLE t1 (a int, b int);
CREATE UNIQUE INDEX i1 on t1 (a, b);
INSERT INTO t1 VALUES (5, null), (5, null);
COMMIT;

# ----------------------------------------------------- #
# --- Test                                          --- #
# ----------------------------------------------------- #
SELECT * FROM t1 FOR UPDATE;
--error 1582
UPDATE t1 SET b = 2;
UPDATE t1 SET b = 2 LIMIT 1;
ROLLBACK;
UPDATE t1 SET b = 2 LIMIT 1;

# ----------------------------------------------------- #
# --- Check                                         --- #
# ----------------------------------------------------- #
SELECT count(*) FROM t1;

# ----------------------------------------------------- #
# --- Final cleanup                                 --- #
# ----------------------------------------------------- #
DROP TABLE t1;


--- 1.315/mysql-test/t/disabled.def	2007-04-30 08:17:44 +02:00
+++ 1.316/mysql-test/t/disabled.def	2007-04-30 22:17:25 +02:00
@@ -70,6 +70,7 @@
 falcon_bug_27997    : Bug#27997 2007-04-21 hakank Currently failing
 falcon_bug_28026    : Bug#28026 2007-04-25 hakank Currently failing
 falcon_bug_28158    : Bug#28158 2007-04-30 hakank Currently failing
+falcon_bug_28165    : Bug#28165 2007-04-30 hakank Currently hangs
 falcon_page_size_1  : Bug#23220 2007-02-19 hakank Currently failing
 falcon_page_size_2  : Bug#23220 2007-02-19 hakank Currently failing
 read_many_rows_falcon : Bug#23783 2006-10-30 ML Get pushbuild green