bk commit into 5.1 tree (kent:1.2136) BUG#16780

[kent]

Below is the list of changes that have just been committed into a local
5.1 repository of kent. When kent 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.2136 06/02/17 21:55:27 kent@stripped +2 -0
  mysql-test-run.sh:
    Set the ndbcluster slave port (bug#16780)
  disabled.def:
    Disabled 'mysqldump' until bug 17443 is closed

  mysql-test/mysql-test-run.sh
    1.301 06/02/17 21:25:36 kent@stripped +1 -0
    Set the ndbcluster slave port (bug#16780)

  mysql-test/t/disabled.def
    1.76 06/02/17 20:43:52 kent@stripped +7 -6
    Disabled 'mysqldump' until bug 17443 is closed

# 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:	kent
# Host:	c-6f4072d5.010-2112-6f72651.cust.bredbandsbolaget.se
# Root:	/Users/kent/mysql/bk/mysql-5.1-release

--- 1.300/mysql-test/mysql-test-run.sh	2006-02-11 23:55:43 +01:00
+++ 1.301/mysql-test/mysql-test-run.sh	2006-02-17 21:25:36 +01:00
@@ -257,6 +257,7 @@
   MYSQL_MANAGER_PORT=`expr $MASTER_MYPORT + 2`
   SLAVE_MYPORT=`expr $MASTER_MYPORT + 3`
   NDBCLUSTER_PORT=`expr $MASTER_MYPORT + 6`
+  NDBCLUSTER_PORT_SLAVE=`expr $MASTER_MYPORT + 7`
 
   echo "Using MTR_BUILD_THREAD      = $MTR_BUILD_THREAD"
   echo "Using MASTER_MYPORT         = $MASTER_MYPORT"

--- 1.75/mysql-test/t/disabled.def	2006-02-17 09:02:04 +01:00
+++ 1.76/mysql-test/t/disabled.def	2006-02-17 20:43:52 +01:00
@@ -35,14 +35,15 @@
 #rpl_ndb_log            : result not deterministic
 rpl_ndb_relay_space     : Bug#16993
 rpl_ndb_multi_update3   : Bug#17400: delete & update of rows in table without pk fails
-rpl_ndb_sp007           : Bug #17290
-rpl_row_create_table    : Bug #17385
-rpl_row_basic_2myisam   : Bug #17385
-rpl_row_basic_3innodb   : Bug #17385
+rpl_ndb_sp007           : Bug#17290
+rpl_row_create_table    : Bug#17385
+rpl_row_basic_2myisam   : Bug#17385
+rpl_row_basic_3innodb   : Bug#17385
 rpl_sp                  : Bug#16456
 rpl_until               : Unstable test case, bug#15886
 sp-goto                 : GOTO is currently is disabled - will be fixed in the future
 subselect               : Bug#15706 (ps mode) [PATCH PENDING]
-rpl_ndb_blob            : Bug #17505
-rpl_ndb_blob2           : Bug #17505
+rpl_ndb_blob            : Bug#17505
+rpl_ndb_blob2           : Bug#17505
 rpl_ndb_log             : results are not deterministic
+mysqldump               : Bug#17443 mysqlimport --use-threads=5 gives crashes