List:Commits« Previous MessageNext Message »
From:tomas Date:March 28 2006 11:28am
Subject:bk commit into 5.1 tree (tomas:1.2245)
View as plain text  
Below is the list of changes that have just been committed into a local
5.1 repository of tomas. When tomas 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
  1.2245 06/03/28 13:28:33 tomas@stripped +1 -0
  Merge tulin@stripped:/home/bk/mysql-5.1-new
  into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new

  mysql-test/t/disabled.def
    1.115 06/03/28 13:28:25 tomas@stripped +0 -0
    Auto merged

# 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:	tomas
# Host:	poseidon.ndb.mysql.com
# Root:	/home/tomas/mysql-5.1-new/RESYNC

--- 1.114/mysql-test/t/disabled.def	2006-03-28 11:47:44 +02:00
+++ 1.115/mysql-test/t/disabled.def	2006-03-28 13:28:25 +02:00
@@ -23,6 +23,7 @@
 ps_7ndb                 : dbug assert in RBR mode when executing test suite
 #rpl_bit_npk             : Bug#13418
 #rpl_ddl                 : Bug#15963 SBR does not show "Definer" correctly
+rpl_ndb_dd_basic        : Bug #18569
 rpl_ndb_2innodb         : assertion in get_parts_for_update()
 rpl_ndb_2myisam         : assertion in get_parts_for_update()
 rpl_ndb_auto_inc        : Bug#17086
@@ -31,6 +32,7 @@
 #rpl_ndb_blob2           : interferes with following tests, causing hang
 rpl_ndb_ddl             : master hangs
 #rpl_ndb_delete_nowhere  : Bug#17400: delete & update of rows in table without pk fails
+rpl_ndb_insert_ignore : Bug #18567
 rpl_ndb_innodb2ndb      : Bug#18261: Cluster Replication: tests rpl_ndb_xxx2ndb fails
 rpl_ndb_myisam2ndb      : Bug#18261: Cluster Replication: tests rpl_ndb_xxx2ndb fails
 rpl_ndb_log             : result not deterministic, TBD if should remove
Thread
bk commit into 5.1 tree (tomas:1.2245)tomas28 Mar