bzr push into mysql-6.0-falcon branch (hky:2859 to 2860)

[Hakan Kuecuekyilmaz]

 2860 Hakan Kuecuekyilmaz	2008-10-06
      Refactored test cases and cleaned up comments.
modified:
  mysql-test/suite/falcon/r/falcon_bug_34890.result
  mysql-test/suite/falcon/t/falcon_bug_34890.test
  mysql-test/suite/falcon/t/falcon_bug_34892.test

 2859 Hakan Kuecuekyilmaz	2008-10-06
      Post merge fix.
modified:
  .bzr-mysql/default.conf

=== modified file 'mysql-test/suite/falcon/r/falcon_bug_34890.result'
--- a/mysql-test/suite/falcon/r/falcon_bug_34890.result	2008-03-27 16:50:16 +0000
+++ b/mysql-test/suite/falcon/r/falcon_bug_34890.result	2008-10-06 19:17:21 +0000
@@ -16,7 +16,7 @@ CREATE TABLE t1 (
 t1_autoinc INTEGER NOT NULL AUTO_INCREMENT,
 t1_uuid CHAR(36),
 PRIMARY KEY (t1_autoinc)
-) ENGINE = Falcon;
+);
 CREATE PROCEDURE p1 ()
 begin
 DECLARE my_count INT DEFAULT 0;

=== modified file 'mysql-test/suite/falcon/t/falcon_bug_34890.test'
--- a/mysql-test/suite/falcon/t/falcon_bug_34890.test	2008-03-27 16:50:16 +0000
+++ b/mysql-test/suite/falcon/t/falcon_bug_34890.test	2008-10-06 19:17:21 +0000
@@ -1,9 +1,10 @@
 --source include/have_falcon.inc
+
 #
 # Bug #34890: Update Conflict on non-overlapping transactions
-# This test works because it uses FALCON_CONSISTENT_READ=OFF
-# This test is different from 34351_C in that there is no index
-# on t1_uuid.
+#   This test works because it uses FALCON_CONSISTENT_READ=OFF
+#   This test is different from 34351_C in that there is no index
+#   on t1_uuid.
 #
 --echo *** Bug #34890 ***
 
@@ -42,9 +43,7 @@ CREATE TABLE t1 (
   t1_autoinc INTEGER NOT NULL AUTO_INCREMENT,
   t1_uuid CHAR(36),
   PRIMARY KEY (t1_autoinc)
-) ENGINE = Falcon;
-
-#   declare continue handler for sqlexception
+);
 
 delimiter //;
 CREATE PROCEDURE p1 ()
@@ -64,7 +63,6 @@ delimiter ;//
 # ----------------------------------------------------- #
 # --- Test                                          --- #
 # ----------------------------------------------------- #
-
 --echo # Switch to connection conn1
 connection conn1;
 --echo # Send call p1() to the server but do not pull the results
@@ -110,11 +108,9 @@ connection conn4;
 --echo # Pull the results of the preceeding call p1() by conn4
 --reap
 
-
 --echo # Switch to connection default
 connection default;
 
-
 # ----------------------------------------------------- #
 # --- Check                                         --- #
 # ----------------------------------------------------- #

=== modified file 'mysql-test/suite/falcon/t/falcon_bug_34892.test'
--- a/mysql-test/suite/falcon/t/falcon_bug_34892.test	2008-10-02 10:37:27 +0000
+++ b/mysql-test/suite/falcon/t/falcon_bug_34892.test	2008-10-06 19:17:21 +0000
@@ -1,6 +1,7 @@
 --source include/have_falcon.inc
+
 #
-# Bug #34892: Some falcon tests fail sporadically
+# Bug #34892: Transaction handling in select_create::abort let's Falcon fail
 #
 --echo *** Bug #34892 ***
 
@@ -21,8 +22,6 @@ SET @@autocommit = 0;
 --error ER_DUP_ENTRY
 CREATE TABLE t1 (PRIMARY KEY (a)) SELECT 1 AS a UNION ALL SELECT 1;
 
-# This CREATE TABLE provokes a
-# 1005: Can't create table 'test.t1' (errno: 156).
 CREATE TABLE t1 (a int);
 
 # ----------------------------------------------------- #