#At file:///home/hakan/work/mysql/mysql-6.0-falcon-team/
2837 Hakan Kuecuekyilmaz 2008-09-28
Cleanup.
modified:
mysql-test/suite/falcon_team/r/falcon_bug_34351_C.result
mysql-test/suite/falcon_team/t/falcon_bug_34351_C.test
mysql-test/suite/falcon_team/t/test2bug.def
per-file messages:
mysql-test/suite/falcon_team/r/falcon_bug_34351_C.result
Adjusted result file.
mysql-test/suite/falcon_team/t/falcon_bug_34351_C.test
Removed
SELECT count(*) FROM t1;
Added missing
DROP TABLE t1;
mysql-test/suite/falcon_team/t/test2bug.def
Added falcon_deadlock to list of
known issues.
=== modified file 'mysql-test/suite/falcon_team/r/falcon_bug_34351_C.result'
--- a/mysql-test/suite/falcon_team/r/falcon_bug_34351_C.result 2008-04-24 04:09:39 +0000
+++ b/mysql-test/suite/falcon_team/r/falcon_bug_34351_C.result 2008-09-28 07:16:36 +0000
@@ -35,7 +35,5 @@ CALL p1();
CALL p1();
# Switch to connection default
# Pull the results of the preceeding call p1()
-SELECT count(*) FROM t1;
-count(*)
-0
DROP PROCEDURE p1;
+DROP TABLE t1;
=== modified file 'mysql-test/suite/falcon_team/t/falcon_bug_34351_C.test'
--- a/mysql-test/suite/falcon_team/t/falcon_bug_34351_C.test 2008-04-24 04:09:39 +0000
+++ b/mysql-test/suite/falcon_team/t/falcon_bug_34351_C.test 2008-09-28 07:16:36 +0000
@@ -1,4 +1,5 @@
--source include/have_falcon.inc
+
#
# Bug #34351_C: Update Conflict on non-overlapping transactions
# This test works because it uses FALCON_CONSISTENT_READ=OFF
@@ -30,8 +31,6 @@ CREATE TABLE t1 (
PRIMARY KEY (t1_autoinc), key(t1_uuid)
) ENGINE = Falcon;
-# declare continue handler for sqlexception
-
delimiter //;
CREATE PROCEDURE p1 ()
begin
@@ -77,14 +76,14 @@ connection default;
--echo # Pull the results of the preceeding call p1()
--reap
-
# ----------------------------------------------------- #
# --- Check --- #
# ----------------------------------------------------- #
# Checking row count is not applicable here.
-SELECT count(*) FROM t1;
+#SELECT count(*) FROM t1;
# ----------------------------------------------------- #
# --- Final cleanup --- #
# ----------------------------------------------------- #
DROP PROCEDURE p1;
+DROP TABLE t1;
=== modified file 'mysql-test/suite/falcon_team/t/test2bug.def'
--- a/mysql-test/suite/falcon_team/t/test2bug.def 2008-09-27 07:52:18 +0000
+++ b/mysql-test/suite/falcon_team/t/test2bug.def 2008-09-28 07:16:36 +0000
@@ -21,3 +21,4 @@ falcon_bug_23945: Bug#34892 - Transactio
falcon_bug_26433: Bug#39314 - falcon_bug_26433 fails with an offset of 1 in row numbers in expected warnings
falcon_bug_28048: Bug#36700 - Running falcon_bug_28048 shows increasing memory usage and run time
falcon_bug_34892: Bug#34892 - Transaction handling in select_create::abort let's Falcon fail
+falcon_deadlock: Bug#34182 - SELECT ... FOR UPDATE does not lock when in subquery
