diff options
| author | unknown <jmiller@mysql.com> | 2006-02-16 16:33:46 +0100 |
|---|---|---|
| committer | unknown <jmiller@mysql.com> | 2006-02-16 16:33:46 +0100 |
| commit | 14a4824194538925f609116d8a2cd10789e97f46 (patch) | |
| tree | ce92054929f69f90d2e4a50ac4ceb4c7422cde1c /mysql-test/include | |
| parent | b4e7b365b5ebb95c20b2f737a86a4605d711e1cb (diff) | |
| download | mariadb-git-14a4824194538925f609116d8a2cd10789e97f46.tar.gz | |
Test updates
mysql-test/t/ndb_dd_backuprestore.test:
Updated with suggestions from Jonas
mysql-test/include/ndb_restore_master.inc:
corrected issues with using cygwin to create
mysql-test/include/ndb_backup.inc:
corrected issues with using cygwin to create
Diffstat (limited to 'mysql-test/include')
| -rw-r--r-- | mysql-test/include/ndb_backup.inc | 17 | ||||
| -rw-r--r-- | mysql-test/include/ndb_restore_master.inc | 8 |
2 files changed, 11 insertions, 14 deletions
diff --git a/mysql-test/include/ndb_backup.inc b/mysql-test/include/ndb_backup.inc index f1ff79e3c32..2163b479ed6 100644 --- a/mysql-test/include/ndb_backup.inc +++ b/mysql-test/include/ndb_backup.inc @@ -2,22 +2,23 @@ # By JBM 2006-02-16 So that the code is not repeated # # in test cases and can be reused. # ###################################################### ---exec $NDB_MGM --no-defaults --ndb-connectstring="localhost:$NDBCLUSTER_PORT" -e "star -t 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 --delimiter=',' 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 TEMPORARY TABLE IF NOT EXISTS test.backup_info (id INT, backup_id INT) ENGINE = HEAP; -CREATE TEMPORARY TABLE IF NOT EXISTS test.backup_info (id INT, backup_id INT) ENGINE = -HEAP; DELETE FROM test.backup_info; -LOAD DATA INFILE '../../var/tmp.dat' INTO TABLE test.backup_info FIELDS TERMINATED BY ' -,'; +LOAD DATA INFILE '../../var/tmp.dat' INTO TABLE test.backup_info FIELDS TERMINATED BY ','; + --replace_column 1 <the_backup_id> + SELECT @the_backup_id:=backup_id FROM test.backup_info; + let the_backup_id=`select @the_backup_id`; + DROP TABLE test.backup_info; diff --git a/mysql-test/include/ndb_restore_master.inc b/mysql-test/include/ndb_restore_master.inc index dc7765e99d7..b01a0b58ee9 100644 --- a/mysql-test/include/ndb_restore_master.inc +++ b/mysql-test/include/ndb_restore_master.inc @@ -3,10 +3,6 @@ # in test cases and can be reused. # ###################################################### ---exec $NDB_TOOLS_DIR/ndb_restore --no-defaults --ndb-connectstring="localhost:$NDBCLUS -TER_PORT" -p 8 -b $the_backup_id -n 1 -m -r --print --print_meta $NDB_BACKUP_DIR/BACKUP -/BACKUP-$the_backup_id >> $NDB_TOOLS_OUTPUT +--exec $NDB_TOOLS_DIR/ndb_restore --no-defaults --ndb-connectstring="localhost:$NDBCLUSTER_PORT" -p 8 -b $the_backup_id -n 1 -m -r --print --print_meta $NDB_BACKUP_DIR/BACKUP/BACKUP-$the_backup_id >> $NDB_TOOLS_OUTPUT ---exec $NDB_TOOLS_DIR/ndb_restore --no-defaults --ndb-connectstring="localhost:$NDBCLUS -TER_PORT" -p 8 -b $the_backup_id -n 2 -r --print --print_meta $NDB_BACKUP_DIR/BACKUP/B -ACKUP-$the_backup_id >> $NDB_TOOLS_OUTPUT +--exec $NDB_TOOLS_DIR/ndb_restore --no-defaults --ndb-connectstring="localhost:$NDBCLUSTER_PORT" -p 8 -b $the_backup_id -n 2 -r --print --print_meta $NDB_BACKUP_DIR/BACKUP/BACKUP-$the_backup_id >> $NDB_TOOLS_OUTPUT |