bk commit into 5.1 tree (jmiller:1.2105)

[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.2105 06/02/10 12:58:55 jmiller@stripped +3 -0
  Merge jmiller@stripped:/home/bk/mysql-5.1-new
  into  mysql.com:/home/ndbdev/jmiller/clones/mysql-5.1-new

  mysql-test/t/rpl_ndb_sync.test
    1.5 06/02/10 12:58:38 jmiller@stripped +2 -1
    manual merge

  mysql-test/t/disabled.def
    1.62 06/02/10 12:57:58 jmiller@stripped +0 -0
    SCCS merged

  mysql-test/r/rpl_ndb_sync.result
    1.4 06/02/10 12:56:47 jmiller@stripped +2 -1
    manual merge

# 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.61/mysql-test/t/disabled.def	2006-02-09 11:35:53 +01:00
+++ 1.62/mysql-test/t/disabled.def	2006-02-10 12:57:58 +01:00
@@ -27,11 +27,12 @@
 rpl_sp          : Bug #16456
 ndb_autodiscover : Needs to be fixed w.r.t binlog
 ndb_autodiscover2 : Needs to be fixed w.r.t binlog
-#ndb_alter_table_row : sometimes wrong error 1015!=1046
+ndb_alter_table_row : sometimes wrong error 1015!=1046
 ndb_gis : garbled msgs from corrupt THD*
-rpl_ndb_auto_inc : MySQL Bugs:17086
-rpl_ndb_relay_space : Bug 16993
+rpl_ndb_auto_inc : Bug #17086
+rpl_ndb_relay_space : Bug #16993
 ndb_binlog_ddl_multi : Bug #17038
-rpl_ndb_log : MySQL Bugs: #17158
+rpl_ndb_log :  Bug #17158
+rpl_ndb_sp007 : Bug #17290
 subselect       : Bug#15706
 ndb_load        : Bug #17233