bk commit into 5.1 tree (tomas:1.2099)

[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.2099 06/02/10 00:15:07 tomas@stripped +3 -0
  changed to use temporary heap table on a ndb test
  corrected multiple --log-bin options in mysql-test-run

  mysql-test/t/rpl_ndb_sync.test
    1.3 06/02/10 00:15:01 tomas@stripped +1 -2
    changed to use temporary heap table on a ndb test

  mysql-test/r/rpl_ndb_sync.result
    1.2 06/02/10 00:15:01 tomas@stripped +1 -2
    changed to use temporary heap table on a ndb test

  mysql-test/mysql-test-run.sh
    1.298 06/02/10 00:15:01 tomas@stripped +5 -2
    corrected multiple --log-bin options in mysql-test-run

# 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.297/mysql-test/mysql-test-run.sh	2006-02-08 11:11:35 +01:00
+++ 1.298/mysql-test/mysql-test-run.sh	2006-02-10 00:15:01 +01:00
@@ -1382,7 +1382,7 @@
   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"
+    MASTER_MYSQLD_BINLOG_OPT="--log-bin=$MYSQL_TEST_DIR/var/log/master-bin$1"
   fi
   if [ -z "$DO_BENCH" -a -z "$DO_STRESS"  ]
   then
@@ -1409,6 +1409,7 @@
           --loose-binlog-show-xid=0 \
 	   $MASTER_40_ARGS \
            $SMALL_SERVER \
+           $MASTER_MYSQLD_BINLOG_OPT \
            $EXTRA_MASTER_MYSQLD_OPT $EXTRA_MASTER_OPT \
            $NOT_FIRST_MASTER_EXTRA_OPTS $CURR_MASTER_MYSQLD_TRACE"
   else
@@ -1432,6 +1433,7 @@
           --loose-binlog-show-xid=0 \
 	   $MASTER_40_ARGS \
            $SMALL_SERVER \
+           $MASTER_MYSQLD_BINLOG_OPT \
            $EXTRA_MASTER_MYSQLD_OPT $EXTRA_MASTER_OPT \
            $NOT_FIRST_MASTER_EXTRA_OPTS"
   fi
@@ -1574,7 +1576,7 @@
 
   if [ x$SLAVE_MYSQLDBINLOG = x1 ]
   then
-    EXTRA_SLAVE_MYSQLD_OPT="$EXTRA_SLAVE_MYSQLD_OPT
--log-bin=$MYSQL_TEST_DIR/var/log/$slave_ident-bin --log-slave-updates"
+    SLAVE_MYSQLD_BINLOG_OPT="--log-bin=$MYSQL_TEST_DIR/var/log/$slave_ident-bin
--log-slave-updates"
   fi
 
   $RM -f $slave_datadir/log.*
@@ -1603,6 +1605,7 @@
           --log-bin-trust-function-creators \
           --loose-binlog-show-xid=0 \
            $SMALL_SERVER \
+           $SLAVE_MYSQLD_BINLOG_OPT \
            $EXTRA_SLAVE_MYSQLD_OPT $EXTRA_SLAVE_OPT \
            $USE_NDBCLUSTER_SLAVE_OPT"
   CUR_MYERR=$slave_err

--- 1.1/mysql-test/r/rpl_ndb_sync.result	2006-01-12 19:50:41 +01:00
+++ 1.2/mysql-test/r/rpl_ndb_sync.result	2006-02-10 00:15:01 +01:00
@@ -25,8 +25,7 @@
 0	1	BCDEF
 1	0	CD
 0	0	DEFGHIJKL
-CREATE TABLE IF NOT EXISTS cluster_replication.backup_info (id INT, backup_id INT);
-DELETE FROM cluster_replication.backup_info;
+CREATE TEMPORARY TABLE cluster_replication.backup_info (id INT, backup_id INT)
ENGINE=HEAP;
 LOAD DATA INFILE '../../var/tmp.dat' INTO TABLE cluster_replication.backup_info FIELDS
TERMINATED BY ',';
 SELECT @the_backup_id:=backup_id FROM cluster_replication.backup_info;
 @the_backup_id:=backup_id

--- 1.2/mysql-test/t/rpl_ndb_sync.test	2006-01-17 13:09:13 +01:00
+++ 1.3/mysql-test/t/rpl_ndb_sync.test	2006-02-10 00:15:01 +01:00
@@ -27,8 +27,7 @@
 # take a backup on master
 --exec $NDB_MGM --no-defaults --ndb-connectstring="localhost:$NDBCLUSTER_PORT" -e "start
backup" >> $NDB_TOOLS_OUTPUT
 --exec $NDB_TOOLS_DIR/ndb_select_all --no-defaults
--ndb-connectstring="localhost:$NDBCLUSTER_PORT" -d sys --delimiter=',' SYSTAB_0 | grep
520093696 > var/tmp.dat
-CREATE TABLE IF NOT EXISTS cluster_replication.backup_info (id INT, backup_id INT);
-DELETE FROM cluster_replication.backup_info;
+CREATE TEMPORARY TABLE cluster_replication.backup_info (id INT, backup_id INT)
ENGINE=HEAP;
 LOAD DATA INFILE '../../var/tmp.dat' INTO TABLE cluster_replication.backup_info FIELDS
TERMINATED BY ',';
 --replace_column 1 <the_backup_id>
 SELECT @the_backup_id:=backup_id FROM cluster_replication.backup_info;