Below is the list of changes that have just been committed into a local
5.1 repository of patg. When patg 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, 2006-08-31 09:43:15-04:00, pgalbraith@stripped +1 -0
Merge buffy.netfrastructure.com:/home/patg/mysql-build/mysql-5.1-engines
into buffy.netfrastructure.com:/home/patg/mysql-build/mysql-5.1-engines-to-main-merge
MERGE: 1.2264.16.2
mysql-test/t/disabled.def@stripped, 2006-08-31 09:42:56-04:00, pgalbraith@stripped +0 -0
Auto merged
MERGE: 1.184.2.1
# 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: pgalbraith
# Host: buffy.netfrastructure.com
# Root: /home/patg/mysql-build/mysql-5.1-engines-to-main-merge/RESYNC
--- 1.187/mysql-test/t/disabled.def 2006-08-31 09:44:23 -04:00
+++ 1.188/mysql-test/t/disabled.def 2006-08-31 09:44:23 -04:00
@@ -16,6 +16,7 @@
#im_instance_conf : Bug#20294 2006-06-06 monty Instance manager test im_instance_conf fails randomly
im_options : Bug#20294 2006-07-24 stewart Instance manager test im_instance_conf fails randomly
#im_life_cycle : Bug#20368 2006-06-10 alik im_life_cycle test fails
+concurrent_innodb : BUG#21579 2006-08-11 mleich innodb_concurrent random failures with varying differences
ndb_autodiscover : BUG#18952 2006-02-16 jmiller Needs to be fixed w.r.t binlog
ndb_autodiscover2 : BUG#18952 2006-02-16 jmiller Needs to be fixed w.r.t binlog
ndb_binlog_ignore_db : BUG#21279 2006-07-25 ingo Randomly throws a warning
| Thread |
|---|
| • bk commit into 5.1 tree (pgalbraith:1.2290) | Patrick Galbraith | 31 Aug |
