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-04-25 16:36:31+02:00, hakank@stripped +8 -0
Last round of Mantis Bug Number to bugs.mysql.com number scheme.
Also fixed falcon_deadlock.test.
mysql-test/r/falcon_bug_28095_I.result@stripped, 2007-04-25 16:11:32+02:00, hakank@stripped +0 -0
Rename: mysql-test/r/falcon_bug_126_I.result -> mysql-test/r/falcon_bug_28095_I.result
mysql-test/r/falcon_bug_28095_II.result@stripped, 2007-04-25 16:11:38+02:00, hakank@stripped +0 -0
Rename: mysql-test/r/falcon_bug_126_II.result -> mysql-test/r/falcon_bug_28095_II.result
mysql-test/r/falcon_deadlock.result@stripped, 2007-04-25 16:19:03+02:00, hakank@stripped +0 -0
Rename: mysql-test/r/falcon-deadlock.result -> mysql-test/r/falcon_deadlock.result
mysql-test/t/disabled.def@stripped, 2007-04-25 16:36:17+02:00, hakank@stripped +3 -3
Fixed comments
mysql-test/t/falcon_bug_28095_I.test@stripped, 2007-04-25 16:09:38+02:00, hakank@stripped +0 -0
Rename: mysql-test/t/falcon_bug_126_I.test -> mysql-test/t/falcon_bug_28095_I.test
mysql-test/t/falcon_bug_28095_II-master.opt@stripped, 2007-04-25 16:12:29+02:00, hakank@stripped +0 -0
Rename: mysql-test/t/falcon_bug_126_II-master.opt -> mysql-test/t/falcon_bug_28095_II-master.opt
mysql-test/t/falcon_bug_28095_II.test@stripped, 2007-04-25 16:09:44+02:00, hakank@stripped +0 -0
Rename: mysql-test/t/falcon_bug_126_II.test -> mysql-test/t/falcon_bug_28095_II.test
mysql-test/t/falcon_deadlock.test@stripped, 2007-04-25 16:36:17+02:00, hakank@stripped +2 -2
include/deadlock.inc does not know about $engine.
Fixed it to be $engine_type. Now the tests hangs again.
Acutally SELECT ... FOR UPDATE is working in meantime.
We should re investigate this test.
mysql-test/t/falcon_deadlock.test@stripped, 2007-04-25 16:14:08+02:00, hakank@stripped +0 -0
Rename: mysql-test/t/falcon-deadlock.test -> mysql-test/t/falcon_deadlock.test
# 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: lu0011.wdf.sap.corp
# Root: /home/hakan/work/mysql/mysql-5.1-falcon
--- 1.313/mysql-test/t/disabled.def 2007-04-25 15:44:45 +02:00
+++ 1.314/mysql-test/t/disabled.def 2007-04-25 16:36:17 +02:00
@@ -39,9 +39,9 @@
-handler_falcon : 2007-01-23 hakank Currently fails
-falcon-deadlock : Bug JStar#0000222: missing automatic deadlock resolution
-falcon_bug_22144 : Bug#22144 2006-08-24 hakank Get pushbuild green
+handler_falcon : Bug#28096 2007-01-23 hakank Currently fails
+falcon_deadlock : Bug#28097 2007-04-25 hakank Currently hangs
+falcon_bug_22144 : Bug#22144 2006-08-24 hakank Get pushbuild green
falcon_bug_22151 : Bug#22151 2006-08-24 hakank (Get pushbuild green)
falcon_bug_22154 : Bug#22154 2006-11-04 hakank Too long run time for PB
falcon_bug_22156 : Bug#22156 2006-11-04 hakank Case sensitivity problem
--- 1.1/mysql-test/t/falcon-deadlock.test 2006-07-06 14:58:12 +02:00
+++ 1.3/mysql-test/t/falcon_deadlock.test 2007-04-25 16:36:17 +02:00
@@ -1,7 +1,7 @@
-# This test was derived from innodb-deadlock.test.
+# This test was derived from innodb_deadlock.test.
-- source include/have_falcon.inc
-let $engine = Falcon;
+let $engine_type = Falcon;
# Can't test this with embedded server
-- source include/not_embedded.inc
| Thread |
|---|
| • bk commit into 6.0-falcon tree (hakank:1.2652) | Hakan Kuecuekyilmaz | 25 Apr |
