List:Commits« Previous MessageNext Message »
From:tomas Date:January 17 2006 12:09pm
Subject:bk commit into 5.1 tree (tomas:1.2061)
View as plain text  
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.2061 06/01/17 13:09:22 tomas@stripped +2 -0
  fix some options to ndb tools that seem to be disturbing some shells

  mysql-test/t/rpl_ndb_sync.test
    1.2 06/01/17 13:09:13 tomas@stripped +2 -2
    fix some options to ndb tools that seem to be disturbing some shells

  mysql-test/t/rpl_ndb_bank.test
    1.2 06/01/17 13:09:13 tomas@stripped +2 -2
    fix some options to ndb tools that seem to be disturbing some shells

# 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.1/mysql-test/t/rpl_ndb_bank.test	2006-01-12 19:50:44 +01:00
+++ 1.2/mysql-test/t/rpl_ndb_bank.test	2006-01-17 13:09:13 +01:00
@@ -114,10 +114,10 @@
 # start by taking a backup on master
 --connection master
 RESET MASTER;
---exec $NDB_MGM --no-defaults --ndb-connectstring=localhost:$NDBCLUSTER_PORT -e "start backup" >> $NDB_TOOLS_OUTPUT
+--exec $NDB_MGM --no-defaults --ndb-connectstring="localhost:$NDBCLUSTER_PORT" -e "start backup" >> $NDB_TOOLS_OUTPUT
 
 # there is no neat way to find the backupid, this is a hack to find it...
---exec $NDB_TOOLS_DIR/ndb_select_all --ndb-connectstring=localhost:$NDBCLUSTER_PORT -d sys -D , SYSTAB_0 | grep 520093696 > var/tmp.dat
+--exec $NDB_TOOLS_DIR/ndb_select_all --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) ENGINE = HEAP;
 DELETE FROM cluster_replication.backup_info;
 LOAD DATA INFILE '../../var/tmp.dat' INTO TABLE cluster_replication.backup_info FIELDS TERMINATED BY ',';

--- 1.1/mysql-test/t/rpl_ndb_sync.test	2006-01-12 19:50:47 +01:00
+++ 1.2/mysql-test/t/rpl_ndb_sync.test	2006-01-17 13:09:13 +01:00
@@ -25,8 +25,8 @@
 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 -D , SYSTAB_0 | grep 520093696 > var/tmp.dat
+--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;
 LOAD DATA INFILE '../../var/tmp.dat' INTO TABLE cluster_replication.backup_info FIELDS TERMINATED BY ',';
Thread
bk commit into 5.1 tree (tomas:1.2061)tomas17 Jan