bk commit into 5.1-falcon tree (hakank:1.2573) BUG#27722

[Hakan Kuecuekyilmaz]

Below is the list of changes that have just been committed into a local
5.1-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-10 17:43:16+02:00, hakank@stripped +3 -0
  Added test for BUG#27722.

  mysql-test/r/falcon_bug_27722.result@stripped, 2007-04-10 17:43:11+02:00, hakank@stripped +30 -0
    New BitKeeper file ``mysql-test/r/falcon_bug_27722.result''

  mysql-test/r/falcon_bug_27722.result@stripped, 2007-04-10 17:43:11+02:00, hakank@stripped +0 -0

  mysql-test/t/disabled.def@stripped, 2007-04-10 17:43:11+02:00, hakank@stripped +1 -0
    Test for BUG#27722 is currently failing.

  mysql-test/t/falcon_bug_27722.test@stripped, 2007-04-10 17:43:11+02:00, hakank@stripped +64 -0
    New BitKeeper file ``mysql-test/t/falcon_bug_27722.test''

  mysql-test/t/falcon_bug_27722.test@stripped, 2007-04-10 17:43:11+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_27722.result	07/04/10 17:43:11
*** Bug #27722 ***
SET @@storage_engine = 'Falcon';
DROP TABLE IF EXISTS t1;
CREATE TABLE t1 (a int);
INSERT INTO t1 VALUES (1);
INSERT INTO t1 VALUES (5);
INSERT INTO t1 VALUES (10);
INSERT INTO t1 VALUES (15);
SET @@autocommit = 0;
# Establish connection conn1
SET storage_engine = 'InnoDB';
SET @@autocommit = 0;
# Switch to connection default
BEGIN;
UPDATE t1 SET a = 6 WHERE a = 5;
# Switch to connection conn1
BEGIN;
UPDATE t1 SET a = 16 WHERE a = 15;
# Switch to connection default
COMMIT;
# Switch to connection conn1
COMMIT;
SELECT count(*) FROM t1;
count(*)
4
SELECT count(*) FROM t1 WHERE a = 16;
count(*)
1
# Switch to connection default
DROP TABLE t1;

--- New file ---
+++ mysql-test/t/falcon_bug_27722.test	07/04/10 17:43:11
#
# Bug #27722: Falcon: SELECT ... FOR UPDATE results in wrong error message
#
--echo *** Bug #27722 ***

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

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

CREATE TABLE t1 (a int);

INSERT INTO t1 VALUES (1);
INSERT INTO t1 VALUES (5);
INSERT INTO t1 VALUES (10);
INSERT INTO t1 VALUES (15);

SET @@autocommit = 0;

--echo # Establish connection conn1
connect (conn1,localhost,root,,);
eval SET storage_engine = $engine;
SET @@autocommit = 0;

# ----------------------------------------------------- #
# --- Test                                          --- #
# ----------------------------------------------------- #
--echo # Switch to connection default
connection default;
BEGIN;
UPDATE t1 SET a = 6 WHERE a = 5;

--echo # Switch to connection conn1
connection conn1;
BEGIN;
--send UPDATE t1 SET a = 16 WHERE a = 15

--echo # Switch to connection default
connection default;
COMMIT;

--echo # Switch to connection conn1
connection conn1;
--reap
COMMIT;

# ----------------------------------------------------- #
# --- Check                                         --- #
# ----------------------------------------------------- #
SELECT count(*) FROM t1;
SELECT count(*) FROM t1 WHERE a = 16;

# ----------------------------------------------------- #
# --- Final cleanup                                 --- #
# ----------------------------------------------------- #
--echo # Switch to connection default
connection default;
disconnect conn1;
DROP TABLE t1;


--- 1.298/mysql-test/t/disabled.def	2007-04-07 15:40:43 +02:00
+++ 1.299/mysql-test/t/disabled.def	2007-04-10 17:43:11 +02:00
@@ -79,6 +79,7 @@
 falcon_bug_27357    : Bug#27357 2007-03-23 hakank Currently failing
 falcon_bug_27426    : Bug#27426 2007-03-27 hakank Currently failing
 falcon_bug_27697    : Bug#27697 2007-04-07 hakank Currently failing
+falcon_bug_27722    : Bug#27722 2007-04-10 hakank Currently failing
 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