bk commit into 5.1 tree (tomas:1.2069)

[tomas]

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.2069 06/01/20 14:50:02 tomas@stripped +3 -0
  option to run mysql-test-run without binlog
  calculate ndbcluster slave port

  sql/mysqld.cc
    1.522 06/01/20 14:49:52 tomas@stripped +1 -1
    option to run mysql-test-run without binlog

  mysql-test/mysql-test-run.sh
    1.290 06/01/20 14:49:51 tomas@stripped +8 -2
    option to run mysql-test-run without binlog

  mysql-test/mysql-test-run.pl
    1.55 06/01/20 14:49:51 tomas@stripped +1 -0
    calculate ndbcluster slave port

# 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

--- 1.289/mysql-test/mysql-test-run.sh	2006-01-17 08:25:44 +01:00
+++ 1.290/mysql-test/mysql-test-run.sh	2006-01-20 14:49:51 +01:00
@@ -298,6 +298,7 @@
 NDB_MGM_EXTRA_OPTS=
 NDB_MGMD_EXTRA_OPTS=
 NDBD_EXTRA_OPTS=
+MASTER_MYSQLDBINLOG=1
 SLAVE_MYSQLDBINLOG=1
 
 DO_STRESS=""
@@ -548,6 +549,7 @@
       EXTRA_MASTER_MYSQLD_OPT="$EXTRA_MASTER_MYSQLD_OPT --skip-ndbcluster"
       EXTRA_SLAVE_MYSQLD_OPT="$EXTRA_SLAVE_MYSQLD_OPT --skip-ndbcluster"
       ;;
+    --skip-master-binlog) MASTER_MYSQLDBINLOG=0 ;;
     --skip-slave-binlog) SLAVE_MYSQLDBINLOG=0 ;;
     --skip-*)
       EXTRA_MASTER_MYSQLD_OPT="$EXTRA_MASTER_MYSQLD_OPT $1"
@@ -1356,9 +1358,13 @@
   then
       CURR_MASTER_MYSQLD_TRACE="$EXTRA_MASTER_MYSQLD_TRACE$1"
   fi
+  if [ x$MASTER_MYSQLDBINLOG = x1 ]
+  then
+    EXTRA_MASTER_MYSQLD_OPT="$EXTRA_MASTER_MYSQLD_OPT --log-bin=$MYSQL_TEST_DIR/var/log/master-bin$1"
+  fi
   if [ -z "$DO_BENCH" -a -z "$DO_STRESS"  ]
   then
-    master_args="--no-defaults --log-bin=$MYSQL_TEST_DIR/var/log/master-bin$1 \
+    master_args="--no-defaults \
   	    --server-id=$id  \
           --basedir=$MY_BASEDIR \
           --port=$this_master_myport \
@@ -1384,7 +1390,7 @@
            $EXTRA_MASTER_MYSQLD_OPT $EXTRA_MASTER_OPT \
            $NOT_FIRST_MASTER_EXTRA_OPTS $CURR_MASTER_MYSQLD_TRACE"
   else
-    master_args="--no-defaults --log-bin=$MYSQL_TEST_DIR/var/log/master-bin$1 \
+    master_args="--no-defaults \
           --server-id=$id --rpl-recovery-rank=1 \
           --basedir=$MY_BASEDIR --init-rpl-role=master \
           --port=$this_master_myport \

--- 1.521/sql/mysqld.cc	2006-01-19 07:58:39 +01:00
+++ 1.522/sql/mysqld.cc	2006-01-20 14:49:52 +01:00
@@ -3172,7 +3172,7 @@
   if (opt_binlog_format_id == BF_UNSPECIFIED)
   {
 #ifdef HAVE_NDB_BINLOG
-    if (have_ndbcluster == SHOW_OPTION_YES)
+    if (opt_bin_log && have_ndbcluster == SHOW_OPTION_YES)
       opt_binlog_format_id= BF_ROW;
     else
 #endif

--- 1.54/mysql-test/mysql-test-run.pl	2006-01-19 03:55:59 +01:00
+++ 1.55/mysql-test/mysql-test-run.pl	2006-01-20 14:49:51 +01:00
@@ -517,6 +517,7 @@
     $opt_master_myport=   $ENV{'MTR_BUILD_THREAD'} * 40 + 8120;
     $opt_slave_myport=    $opt_master_myport + 16;
     $opt_ndbcluster_port= $opt_master_myport + 24;
+    $opt_ndbcluster_port_slave= $opt_master_myport + 32;
     $im_port=             $opt_master_myport + 10;
     $im_mysqld1_port=     $opt_master_myport + 12;
     $im_mysqld2_port=     $opt_master_myport + 14;