Commit 0420c0a5 authored by unknown's avatar unknown
Browse files

changed to use temporary heap table on a ndb test 

corrected multiple --log-bin options in mysql-test-run


mysql-test/mysql-test-run.sh:
  corrected multiple --log-bin options in mysql-test-run
mysql-test/r/rpl_ndb_sync.result:
  changed to use temporary heap table on a ndb test
mysql-test/t/rpl_ndb_sync.test:
  changed to use temporary heap table on a ndb test
parent 40aff07a

mysql-test/mysql-test-run.sh

+5 −2
Original line number Diff line number Diff line
@@ -1382,7 +1382,7 @@ start_master() 
  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 @@ start_master() 
          --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 @@ start_master() 
          --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 @@ start_slave() 


  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 @@ start_slave() 
          --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

mysql-test/r/rpl_ndb_sync.result

+1 −2
Original line number Diff line number Diff line
@@ -25,8 +25,7 @@ hex(c2) hex(c3) c1 
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

mysql-test/t/rpl_ndb_sync.test

+1 −2
Original line number Diff line number Diff line
@@ -27,8 +27,7 @@ SELECT hex(c2),hex(c3),c1 FROM t2 ORDER BY c1; 
# 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;