Below is the list of changes that have just been committed into a local
5.1 repository of jonas. When jonas 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-12-08 22:18:59+01:00, jonas@stripped +16 -0
Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.1
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
MERGE: 1.2344.2.10
mysql-test/r/ndb_update.result@stripped, 2006-12-08 22:18:55+01:00, jonas@stripped +0 -0
Auto merged
MERGE: 1.18.1.1
mysql-test/t/disabled.def@stripped, 2006-12-08 22:18:55+01:00, jonas@stripped +0 -0
Auto merged
MERGE: 1.217.1.1
sql/ha_ndbcluster.cc@stripped, 2006-12-08 22:18:55+01:00, jonas@stripped +0 -0
Auto merged
MERGE: 1.372.1.1
sql/item_func.cc@stripped, 2006-12-08 22:18:55+01:00, jonas@stripped +0 -0
Auto merged
MERGE: 1.338.1.1
storage/ndb/src/common/util/File.cpp@stripped, 2006-12-08 22:18:55+01:00, jonas@stripped +0 -0
Auto merged
MERGE: 1.15.1.1
storage/ndb/src/common/util/InputStream.cpp@stripped, 2006-12-08 22:18:55+01:00, jonas@stripped +0 -0
Auto merged
MERGE: 1.7.1.1
storage/ndb/src/common/util/socket_io.cpp@stripped, 2006-12-08 22:18:55+01:00, jonas@stripped +0 -0
Auto merged
MERGE: 1.14.1.1
storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp@stripped, 2006-12-08 22:18:55+01:00, jonas@stripped +0 -0
Auto merged
MERGE: 1.35.1.1
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp@stripped, 2006-12-08 22:18:55+01:00, jonas@stripped +0 -0
Auto merged
MERGE: 1.108.1.1
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp@stripped, 2006-12-08 22:18:56+01:00, jonas@stripped +0 -0
Auto merged
MERGE: 1.92.1.1
storage/ndb/src/kernel/vm/SimulatedBlock.cpp@stripped, 2006-12-08 22:18:56+01:00, jonas@stripped +0 -0
Auto merged
MERGE: 1.36.1.1
storage/ndb/src/mgmsrv/Services.cpp@stripped, 2006-12-08 22:18:56+01:00, jonas@stripped +0 -0
Auto merged
MERGE: 1.80.1.1
storage/ndb/src/ndbapi/NdbTransaction.cpp@stripped, 2006-12-08 22:18:56+01:00, jonas@stripped +0 -0
Auto merged
MERGE: 1.69.1.1
storage/ndb/src/ndbapi/ndberror.c@stripped, 2006-12-08 22:18:56+01:00, jonas@stripped +0 -0
Auto merged
MERGE: 1.78.1.1
storage/ndb/test/run-test/daily-basic-tests.txt@stripped, 2006-12-08 22:18:56+01:00, jonas@stripped +0 -0
Auto merged
MERGE: 1.56.1.1
storage/ndb/tools/ndb_condig.cpp@stripped, 2006-12-08 22:18:56+01:00, jonas@stripped +0 -0
Auto merged
MERGE: 1.17.1.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: jonas
# Host: perch.ndb.mysql.com
# Root: /home/jonas/src/mysql-5.1-new-ndb/RESYNC
--- 1.220/mysql-test/t/disabled.def 2006-12-08 22:19:04 +01:00
+++ 1.221/mysql-test/t/disabled.def 2006-12-08 22:19:04 +01:00
@@ -20,7 +20,6 @@
rpl_ndb_sync : Problem with cluster/def/schema table that is in std_data/ndb_backup51; Pekka will schdule this to someone
partition_03ndb : BUG#16385 2006-03-24 mikael Partitions: crash when updating a range partitioned NDB table
-ps_7ndb : BUG#18950 2006-02-16 jmiller create table like does not obtain LOCK_open
rpl_ndb_2innodb : BUG#19227 2006-04-20 pekka pk delete apparently not replicated
rpl_ndb_2myisam : BUG#19227 Seems to pass currently
rpl_ndb_dd_partitions : BUG#19259 2006-04-21 rpl_ndb_dd_partitions fails on s/AMD
| Thread |
|---|
| • bk commit into 5.1 tree (jonas:1.2357) | jonas | 8 Dec |
