diff options
| author | unknown <joreland@mysql.com> | 2005-02-03 17:04:27 +0100 |
|---|---|---|
| committer | unknown <joreland@mysql.com> | 2005-02-03 17:04:27 +0100 |
| commit | e7c3dc943ca9acd18e47d76501b1a1c904cc0c57 (patch) | |
| tree | e550721c77c3ecdd22156c02ec5f65c71c170f3a /mysql-test/t/ndb_restore.test | |
| parent | 4090963b807c7956c3ae0764a749609eda0e1c40 (diff) | |
| parent | 2e132a8ac821dc0e2c941b1dc2490931eae9509b (diff) | |
| download | mariadb-git-e7c3dc943ca9acd18e47d76501b1a1c904cc0c57.tar.gz | |
merge
configure.in:
Auto merged
mysql-test/mysql-test-run.sh:
Auto merged
mysql-test/t/ndb_autodiscover.test:
Auto merged
mysql-test/t/ndb_restore.test:
Auto merged
ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
Auto merged
ndb/test/include/HugoOperations.hpp:
Auto merged
ndb/test/include/NDBT_Test.hpp:
Auto merged
ndb/include/ndbapi/NdbTransaction.hpp:
Auto merged
ndb/test/src/NDBT_Test.cpp:
Auto merged
Diffstat (limited to 'mysql-test/t/ndb_restore.test')
| -rw-r--r-- | mysql-test/t/ndb_restore.test | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mysql-test/t/ndb_restore.test b/mysql-test/t/ndb_restore.test index 3a77289a8fb..d084461f9be 100644 --- a/mysql-test/t/ndb_restore.test +++ b/mysql-test/t/ndb_restore.test @@ -142,10 +142,10 @@ create table t8_c engine=ndbcluster as select * from t8; create table t9_c engine=ndbcluster as select * from t9; ---exec $NDB_MGM --no-defaults -e "start backup" > /dev/null +--exec $NDB_MGM --no-defaults -e "start backup" >> $NDB_TOOLS_OUTPUT drop table t1_c,t2_c,t3_c,t4_c,t5_c,t6_c,t7_c,t8_c,t9_c; ---exec $NDB_TOOLS_DIR/ndb_restore --no-defaults -b 1 -n 1 -m -r --print --print_meta $NDB_BACKUP_DIR/BACKUP/BACKUP-1 > /tmp/ndb_restore.out ---exec $NDB_TOOLS_DIR/ndb_restore --no-defaults -b 1 -n 2 -r --print --print_meta $NDB_BACKUP_DIR/BACKUP/BACKUP-1 > /tmp/ndb_restore.out +--exec $NDB_TOOLS_DIR/ndb_restore --no-defaults -b 1 -n 1 -m -r --print --print_meta $NDB_BACKUP_DIR/BACKUP/BACKUP-1 >> $NDB_TOOLS_OUTPUT +--exec $NDB_TOOLS_DIR/ndb_restore --no-defaults -b 1 -n 2 -r --print --print_meta $NDB_BACKUP_DIR/BACKUP/BACKUP-1 >> $NDB_TOOLS_OUTPUT show tables; |