bk commit into 6.0-falcon tree (hakank:1.2662) BUG#29240

[Hakan Kuecuekilmaz]

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-07-26 14:30:05+02:00, hakank@stripped +2 -0
  Added test for Bug#29240.

  mysql-test/r/falcon_bug_29240.result@stripped, 2007-07-26 14:30:01+02:00, hakank@stripped
+23 -0
    New BitKeeper file ``mysql-test/r/falcon_bug_29240.result''

  mysql-test/r/falcon_bug_29240.result@stripped, 2007-07-26 14:30:01+02:00, hakank@stripped
+0 -0

  mysql-test/t/falcon_bug_29240.test@stripped, 2007-07-26 14:30:01+02:00, hakank@stripped
+55 -0
    New BitKeeper file ``mysql-test/t/falcon_bug_29240.test''

  mysql-test/t/falcon_bug_29240.test@stripped, 2007-07-26 14:30:01+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:	au0012.local
# Root:	/Users/hakan/work/mysql/mysql-5.1-falcon
--- New file ---
+++ mysql-test/r/falcon_bug_29240.result	07/07/26 14:30:01
*** Bug #29240 ***
SET @@storage_engine = 'Falcon';
DROP TABLE IF EXISTS t1;
CREATE TABLE t1 (a int unique);
SET @@autocommit = 0;
INSERT INTO t1 VALUES (1);
# Establish connection conn1
SET storage_engine = 'Falcon';
SET @@autocommit = 0;
INSERT INTO t1 VALUES (1);
# Switch to connection default
INSERT INTO t1 VALUES (1);
ERROR 23000: Duplicate entry '1' for key 'a'
DELETE FROM t1;
COMMIT;
# Switch to connection conn1
COMMIT;
SELECT count(*) FROM t1;
count(*)
1
COMMIT;
# Switch to connection default
DROP TABLE t1;

--- New file ---
+++ mysql-test/t/falcon_bug_29240.test	07/07/26 14:30:01
#
# Bug #29240: Falcon: duplicate-key error when there's no duplicate key
#
--echo *** Bug #29240 ***

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

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

CREATE TABLE t1 (a int unique);
SET @@autocommit = 0;
INSERT INTO t1 VALUES (1);

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


# ----------------------------------------------------- #
# --- Test                                          --- #
# ----------------------------------------------------- #
--send INSERT INTO t1 VALUES (1)

--echo # Switch to connection default
connection default;
--error 1582
INSERT INTO t1 VALUES (1);
DELETE FROM t1;
COMMIT;

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

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

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