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-08-22 09:49:28+02:00, jonas@stripped +2 -0
Merge perch.ndb.mysql.com:/home/jonas/src/51-work
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
MERGE: 1.2270.1.7
mysql-test/t/disabled.def@stripped, 2006-08-22 09:49:25+02:00, jonas@stripped +0 -0
Auto merged
MERGE: 1.185.1.1
storage/ndb/src/ndbapi/ndberror.c@stripped, 2006-08-22 09:49:25+02:00, jonas@stripped +0 -0
Auto merged
MERGE: 1.69.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.187/mysql-test/t/disabled.def 2006-08-22 09:49:33 +02:00
+++ 1.188/mysql-test/t/disabled.def 2006-08-22 09:49:33 +02:00
@@ -39,8 +39,8 @@
# the below testcase have been reworked to avoid the bug, test contains comment, keep bug open
#ndb_binlog_ddl_multi : BUG#18976 2006-04-10 kent CRBR: multiple binlog, second binlog may miss schema log events
-rpl_ndb_idempotent : BUG#21298 2006-07-27 msvensson
-rpl_row_basic_7ndb : BUG#21298 2006-07-27 msvensson
-rpl_truncate_7ndb : BUG#21298 2006-07-27 msvensson
+#rpl_ndb_idempotent : BUG#21298 2006-07-27 msvensson
+#rpl_row_basic_7ndb : BUG#21298 2006-07-27 msvensson
+#rpl_truncate_7ndb : BUG#21298 2006-07-27 msvensson
crash_commit_before : 2006-08-02 msvensson
rpl_ndb_dd_advance : BUG#18679 2006-07-28 jimw (Test fails randomly)
--- 1.70/storage/ndb/src/ndbapi/ndberror.c 2006-08-22 09:49:33 +02:00
+++ 1.71/storage/ndb/src/ndbapi/ndberror.c 2006-08-22 09:49:33 +02:00
@@ -376,7 +376,7 @@
{ 752, DMEC, SE, "Invalid file format" },
{ 753, IE, SE, "Invalid filegroup for file" },
{ 754, IE, SE, "Invalid filegroup version when creating file" },
- { 755, DMEC, SE, "Invalid tablespace" },
+ { 755, HA_WRONG_CREATE_OPTION, SE, "Invalid tablespace" },
{ 756, DMEC, SE, "Index on disk column is not supported" },
{ 757, DMEC, SE, "Varsize bitfield not supported" },
{ 758, DMEC, SE, "Tablespace has changed" },
| Thread |
|---|
| • bk commit into 5.1 tree (jonas:1.2285) | jonas | 22 Aug |
