bk commit into 6.0 tree (hakank:1.2819)

[Hakan Kuecuekilmaz]

Below is the list of changes that have just been committed into a local
6.0 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, 2008-02-20 18:32:28+01:00, hakank@au0012. +3 -0
  Added new test for failing 33184. This time an ER_DUP_KEY is provoked
  by an INSERT, but it does not hit the assertion.

  mysql-test/suite/falcon/r/falcon_bug_33184_II.result@stripped, 2008-02-20 18:32:23+01:00, hakank@au0012. +15 -0
    New BitKeeper file ``mysql-test/suite/falcon/r/falcon_bug_33184_II.result''

  mysql-test/suite/falcon/r/falcon_bug_33184_II.result@stripped, 2008-02-20 18:32:23+01:00, hakank@au0012. +0 -0

  mysql-test/suite/falcon/t/falcon_bug_33184.test@stripped, 2008-02-20 18:32:23+01:00, hakank@au0012. +0 -1
    Removed autocommit = 0

  mysql-test/suite/falcon/t/falcon_bug_33184_II.test@stripped, 2008-02-20 18:32:23+01:00, hakank@au0012. +42 -0
    New BitKeeper file ``mysql-test/suite/falcon/t/falcon_bug_33184_II.test''

  mysql-test/suite/falcon/t/falcon_bug_33184_II.test@stripped, 2008-02-20 18:32:23+01:00, hakank@au0012. +0 -0

diff -Nrup a/mysql-test/suite/falcon/r/falcon_bug_33184_II.result b/mysql-test/suite/falcon/r/falcon_bug_33184_II.result
--- /dev/null	Wed Dec 31 16:00:00 196900
+++ b/mysql-test/suite/falcon/r/falcon_bug_33184_II.result	2008-02-20 18:32:23 +01:00
@@ -0,0 +1,15 @@
+*** Bug #33184_II ***
+SET @@storage_engine = 'Falcon';
+DROP TABLE IF EXISTS t1;
+CREATE TABLE t1 (
+a int,
+primary key(a)
+);
+INSERT INTO t1 VALUES (1);
+INSERT INTO t1 VALUES (2);
+INSERT INTO t1 (a) VALUES (1);
+ERROR 23000: Duplicate entry '1' for key 'PRIMARY'
+SELECT count(*) FROM t1;
+count(*)
+2
+DROP TABLE t1;
diff -Nrup a/mysql-test/suite/falcon/t/falcon_bug_33184.test b/mysql-test/suite/falcon/t/falcon_bug_33184.test
--- a/mysql-test/suite/falcon/t/falcon_bug_33184.test	2008-02-19 22:07:41 +01:00
+++ b/mysql-test/suite/falcon/t/falcon_bug_33184.test	2008-02-20 18:32:23 +01:00
@@ -15,7 +15,6 @@ eval SET @@storage_engine = $engine;
 DROP TABLE IF EXISTS t1;
 --enable_warnings
 
-#SET @@autocommit = 0;
 CREATE TABLE t1 (
   a int,
   primary key(a)
diff -Nrup a/mysql-test/suite/falcon/t/falcon_bug_33184_II.test b/mysql-test/suite/falcon/t/falcon_bug_33184_II.test
--- /dev/null	Wed Dec 31 16:00:00 196900
+++ b/mysql-test/suite/falcon/t/falcon_bug_33184_II.test	2008-02-20 18:32:23 +01:00
@@ -0,0 +1,42 @@
+--source include/have_falcon.inc
+#
+# Bug #33184: Falcon regression tests fail on Mac OS XBug 
+#   Simplified version of Bug #28165: Falcon: hang after select for update
+#   We provoke ER_DUP_KEY on an INSERT here, falcon_bug_33184.test
+#   provokes an ER_DUP_KEY with an UPDATE.
+#
+--echo *** Bug #33184_II ***
+
+# ----------------------------------------------------- #
+# --- Initialisation                                --- #
+# ----------------------------------------------------- #
+let $engine = 'Falcon';
+eval SET @@storage_engine = $engine;
+
+--disable_warnings
+DROP TABLE IF EXISTS t1;
+--enable_warnings
+
+CREATE TABLE t1 (
+  a int,
+  primary key(a)
+);
+
+INSERT INTO t1 VALUES (1);
+INSERT INTO t1 VALUES (2);
+
+# ----------------------------------------------------- #
+# --- Test                                          --- #
+# ----------------------------------------------------- #
+--error ER_DUP_ENTRY
+INSERT INTO t1 (a) VALUES (1);
+
+# ----------------------------------------------------- #
+# --- Check                                         --- #
+# ----------------------------------------------------- #
+SELECT count(*) FROM t1;
+
+# ----------------------------------------------------- #
+# --- Final cleanup                                 --- #
+# ----------------------------------------------------- #
+DROP TABLE t1;