List:Commits« Previous MessageNext Message »
From:klewis Date:March 3 2008 2:18am
Subject:bk commit into 6.0 tree (klewis:1.2585) BUG#34174
View as plain text  
Below is the list of changes that have just been committed into a local
6.0 repository of klewis.  When klewis 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-03-02 20:17:44-06:00, klewis@klewis-mysql. +3 -0
  Disable falcon_bug_34351_A & falcon_bug_34351_A for bug 34990
  Add testcase for Bug#34174

  mysql-test/suite/falcon/r/falcon_bug_34174.result@stripped, 2008-03-02 20:17:35-06:00, klewis@klewis-mysql. +32 -0
    Add testcase for Bug#34174

  mysql-test/suite/falcon/r/falcon_bug_34174.result@stripped, 2008-03-02 20:17:35-06:00, klewis@klewis-mysql. +0 -0

  mysql-test/suite/falcon/t/disabled.def@stripped, 2008-03-02 20:15:17-06:00, klewis@klewis-mysql. +2 -0
    Disable falcon_bug_34351_A & falcon_bug_34351_A for bug 34990

  mysql-test/suite/falcon/t/falcon_bug_34174.test@stripped, 2008-03-02 20:17:33-06:00, klewis@klewis-mysql. +65 -0
    Add testcase for Bug#34174

  mysql-test/suite/falcon/t/falcon_bug_34174.test@stripped, 2008-03-02 20:17:33-06:00, klewis@klewis-mysql. +0 -0

diff -Nrup a/mysql-test/suite/falcon/r/falcon_bug_34174.result b/mysql-test/suite/falcon/r/falcon_bug_34174.result
--- /dev/null	Wed Dec 31 16:00:00 196900
+++ b/mysql-test/suite/falcon/r/falcon_bug_34174.result	2008-03-02 20:17:35 -06:00
@@ -0,0 +1,32 @@
+*** Bug #34174 ***
+SET @@storage_engine = 'Falcon';
+DROP TABLE IF EXISTS t1;
+CREATE TABLE t1 (f1 int primary key, f2 int);
+# establishing conn1
+# switching to default connection
+START TRANSACTION;
+INSERT INTO t1 VALUES (0,0);
+# switching to conn1
+START TRANSACTION;
+SELECT * FROM t1;
+f1	f2
+INSERT INTO t1 VALUES (1,1);
+INSERT INTO t1 VALUES (0,3);
+# switching to default connection
+SELECT * FROM t1;
+f1	f2
+0	0
+UPDATE t1 SET f1 = 1, f2 = 4;
+ERROR 40001: Deadlock found when trying to get lock; try restarting transaction
+SELECT * FROM t1;
+f1	f2
+0	0
+ROLLBACK;
+# switching to conn1
+COMMIT;
+SELECT * FROM t1;
+f1	f2
+1	1
+0	3
+# switching to default connection
+DROP TABLE t1;
diff -Nrup a/mysql-test/suite/falcon/t/disabled.def b/mysql-test/suite/falcon/t/disabled.def
--- a/mysql-test/suite/falcon/t/disabled.def	2008-02-27 11:03:07 -06:00
+++ b/mysql-test/suite/falcon/t/disabled.def	2008-03-02 20:15:17 -06:00
@@ -29,6 +29,8 @@ falcon_bug_30282    : Bug#30282 2007-08-
 falcon_bug_30480_A  : Bug#30282 2007-09-07 klewis Currently failing
 falcon_bug_30480_B  : Bug#30282 2007-09-07 klewis Currently failing
 falcon_bug_32413    : Bug#32413 2008-02-11 hakank Either works on 64-bit or on 32-bit, but not on both platforms. This is a test case problem and not a bug.
+falcon_bug_34351_A  : Bug#34990 2008-02-11 klewis Periodic failures, various asserts (table.cpp Line 2917 & faux timeouts)
+falcon_bug_34351_C  : Bug#34990 2008-02-11 klewis Periodic failures, various asserts (table.cpp Line 2917, line 2455 & faux timeouts)
 falcon_deadlock     : Bug#34182 2008-01-31 hakank Bug in SELECT ... FOR UPDATE
 index_merge_falcon  : Bug#32696 index_merge_falcon.test fails
 ps_8falcon          : Bug#32683  Test ps_8falcon fails in 6.0
diff -Nrup a/mysql-test/suite/falcon/t/falcon_bug_34174.test b/mysql-test/suite/falcon/t/falcon_bug_34174.test
--- /dev/null	Wed Dec 31 16:00:00 196900
+++ b/mysql-test/suite/falcon/t/falcon_bug_34174.test	2008-03-02 20:17:33 -06:00
@@ -0,0 +1,65 @@
+--source include/have_falcon.inc
+#
+# Bug #34174 - Infinite loop checking rolled back record in select for update
+#
+--echo *** Bug #34174 ***
+
+# ----------------------------------------------------- #
+# --- Initialisation                                --- #
+# ----------------------------------------------------- #
+let $engine = 'Falcon';
+eval SET @@storage_engine = $engine;
+
+--disable_warnings
+DROP TABLE IF EXISTS t1;
+--enable_warnings
+
+CREATE TABLE t1 (f1 int primary key, f2 int);
+
+--echo # establishing conn1
+connect (conn1,localhost,root,,);
+
+# ----------------------------------------------------- #
+# --- Test                                          --- #
+# ----------------------------------------------------- #
+
+--echo # switching to default connection
+connection default;
+START TRANSACTION;
+INSERT INTO t1 VALUES (0,0);
+
+--echo # switching to conn1
+connection conn1;
+START TRANSACTION;
+SELECT * FROM t1;
+INSERT INTO t1 VALUES (1,1);
+--send INSERT INTO t1 VALUES (0,3)
+#UPDATE t1 SET f1 = 0, f2 = 5;
+#INSERT INTO t1 VALUES (0,6);
+
+--echo # switching to default connection
+connection default;
+SELECT * FROM t1;
+--error ER_LOCK_DEADLOCK
+UPDATE t1 SET f1 = 1, f2 = 4;
+SELECT * FROM t1;
+ROLLBACK;
+
+--echo # switching to conn1
+connection conn1;
+--reap
+COMMIT;
+
+# ----------------------------------------------------- #
+# --- Check                                         --- #
+# ----------------------------------------------------- #
+SELECT * FROM t1;
+
+# ----------------------------------------------------- #
+# --- Final cleanup                                 --- #
+# ----------------------------------------------------- #
+--echo # switching to default connection
+connection default;
+disconnect conn1;
+DROP TABLE t1;
+
Thread
bk commit into 6.0 tree (klewis:1.2585) BUG#34174klewis3 Mar