Commit d0eea951 authored by unknown's avatar unknown
Browse files

Merge jmiller@bk-internal.mysql.com:/home/bk/mysql-5.1-new 

into  mysql.com:/home/ndbdev/jmiller/clones/mysql-5.1-new
parents b9d41f5d 9b0de7ff

mysql-test/r/rpl_ndb_sync.result

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +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);

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 ',';

SELECT @the_backup_id:=backup_id FROM cluster_replication.backup_info;

mysql-test/t/rpl_ndb_sync.test

+1 −1
Original line number Diff line number Diff line
@@ -27,7 +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);

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 ',';

--replace_column 1 <the_backup_id>