bk commit into 5.1 tree (jmiller:1.2037)

[Jonathan Miller]

Below is the list of changes that have just been committed into a local
5.1 repository of ndbdev. When ndbdev 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.2037 06/01/05 01:01:32 jmiller@stripped +1 -0
  Merge jmiller@stripped:/home/bk/mysql-5.1-new
  into  mysql.com:/home/ndbdev/jmiller/clones/mysql-5.1-new

  mysql-test/t/disabled.def
    1.31 06/01/05 01:01:16 jmiller@stripped +8 -2
    updated.

# 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:	jmiller
# Host:	ndb08.mysql.com
# Root:	/home/ndbdev/jmiller/clones/mysql-5.1-new/RESYNC

--- 1.30/mysql-test/t/disabled.def	2006-01-04 14:00:29 +01:00
+++ 1.31/mysql-test/t/disabled.def	2006-01-05 01:01:16 +01:00
@@ -23,6 +23,14 @@
 type_time       : Bug#15805
 #rpl000002       : Bug#15920 Temporary tables are not binlogged in SBR
 ps_7ndb         : Bug#15923 Core dump in RBR mode when executing test suite
+<<<<<<< gca mysql-test/t/disabled.def 1.27
+sp_trans        : Bug#15924 Code dump in RBR mode when executing test suite
+<<<<<<< local mysql-test/t/disabled.def 1.27.1.2
+sp_trans        : Bug#15924 Code dump in RBR mode when executing test suite
+rpl_loaddata_m  : Bug#15942 RBR ignores --binlog_ignore_db 
+rpl_ddl         : Bug#15963 SBR does not show "Definer" correctly
+<<<<<<< remote mysql-test/t/disabled.def 1.30
 #sp_trans        : Bug#15924 Code dump in RBR mode when executing test suite
 mysqlslap       : Bug#16167
 
+>>>>>>>