diff options
| author | unknown <tomas@whalegate.ndb.mysql.com> | 2007-06-17 19:50:07 +0200 |
|---|---|---|
| committer | unknown <tomas@whalegate.ndb.mysql.com> | 2007-06-17 19:50:07 +0200 |
| commit | 1f2c0193f4863c961b4dba13fa4521b8487d7c83 (patch) | |
| tree | 06da5650ba950112814c6870458f75c8398cb398 | |
| parent | a3c2ebbcddd6b22ed84e028d0508fb1267c75eef (diff) | |
| parent | f2c7b62a3e0cf3f9aed3f6f68eec322e592d7a92 (diff) | |
| download | mariadb-git-1f2c0193f4863c961b4dba13fa4521b8487d7c83.tar.gz | |
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
| -rw-r--r-- | mysql-test/r/ndb_restore.result | 7 | ||||
| -rw-r--r-- | mysql-test/t/ndb_restore.test | 6 |
2 files changed, 10 insertions, 3 deletions
diff --git a/mysql-test/r/ndb_restore.result b/mysql-test/r/ndb_restore.result index bc31798cee7..6799854c5b6 100644 --- a/mysql-test/r/ndb_restore.result +++ b/mysql-test/r/ndb_restore.result @@ -129,6 +129,13 @@ create table t7 engine=myisam as select * from t7_c; create table t8 engine=myisam as select * from t8_c; create table t9 engine=myisam as select * from t9_c; create table t10 engine=myisam as select * from t10_c; +CREATE TEMPORARY TABLE IF NOT EXISTS test.backup_info (id INT, backup_id INT) ENGINE = HEAP; +DELETE FROM test.backup_info; +LOAD DATA INFILE '../tmp.dat' INTO TABLE test.backup_info FIELDS TERMINATED BY ','; +SELECT @the_backup_id:=backup_id FROM test.backup_info; +@the_backup_id:=backup_id +<the_backup_id> +DROP TABLE test.backup_info; drop table t1_c,t2_c,t3_c,t4_c,t5_c,t6_c,t7_c,t8_c,t9_c, t10_c; show tables; Tables_in_test diff --git a/mysql-test/t/ndb_restore.test b/mysql-test/t/ndb_restore.test index 5b839a0d3aa..eba2df926d3 100644 --- a/mysql-test/t/ndb_restore.test +++ b/mysql-test/t/ndb_restore.test @@ -165,10 +165,10 @@ create table t9 engine=myisam as select * from t9_c; create table t10 engine=myisam as select * from t10_c; ---exec $NDB_MGM --no-defaults -e "start backup" >> $NDB_TOOLS_OUTPUT +--source include/ndb_backup.inc drop table t1_c,t2_c,t3_c,t4_c,t5_c,t6_c,t7_c,t8_c,t9_c, t10_c; ---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 +--exec $NDB_TOOLS_DIR/ndb_restore --no-defaults -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 -b $the_backup_id -n 2 -r --print --print_meta $NDB_BACKUP_DIR/BACKUP/BACKUP-$the_backup_id >> $NDB_TOOLS_OUTPUT show tables; |