diff options
| author | unknown <jmiller@mysql.com> | 2006-02-09 12:15:42 +0100 |
|---|---|---|
| committer | unknown <jmiller@mysql.com> | 2006-02-09 12:15:42 +0100 |
| commit | d0eea951f62db409ed5dcbe4fd70460ab738bd59 (patch) | |
| tree | 386092af1fa8de435bc945fd685c89f95a44711f /mysql-test | |
| parent | b9d41f5d1b05ee5c7b12a53e49a09b150ad45de6 (diff) | |
| parent | 9b0de7ff8ce99ce52c65c084a332094ffe623648 (diff) | |
| download | mariadb-git-d0eea951f62db409ed5dcbe4fd70460ab738bd59.tar.gz | |
Merge jmiller@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into mysql.com:/home/ndbdev/jmiller/clones/mysql-5.1-new
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/r/rpl_ndb_sync.result | 2 | ||||
| -rw-r--r-- | mysql-test/t/rpl_ndb_sync.test | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/r/rpl_ndb_sync.result b/mysql-test/r/rpl_ndb_sync.result index 44d0efa7e5a..8449f8cb11e 100644 --- a/mysql-test/r/rpl_ndb_sync.result +++ b/mysql-test/r/rpl_ndb_sync.result @@ -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; diff --git a/mysql-test/t/rpl_ndb_sync.test b/mysql-test/t/rpl_ndb_sync.test index 2e1e96d87de..61591b8fc68 100644 --- a/mysql-test/t/rpl_ndb_sync.test +++ b/mysql-test/t/rpl_ndb_sync.test @@ -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> |