From: Date: June 17 2007 7:27pm
Subject: bk commit into 5.0 tree (tomas:1.2512) BUG#27640
List-Archive: http://lists.mysql.com/commits/28946
X-Bug: 27640
Message-Id: <20070617172725.B86521886CB20@linux.local>

Below is the list of changes that have just been committed into a local
5.0 repository of tomas. When tomas does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-06-17 19:27:20+02:00, tomas@stripped +2 -0
  BUG#27640
  - correct test and result file

  mysql-test/r/ndb_restore.result@stripped, 2007-06-17 19:27:18+02:00, tomas@stripped +7 -0
    BUG#27640
    - correct test and result file

  mysql-test/t/ndb_restore.test@stripped, 2007-06-17 19:27:18+02:00, tomas@stripped +3 -3
    BUG#27640
    - correct test and result file

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	tomas
# Host:	whalegate.ndb.mysql.com
# Root:	/home/tomas/mysql-5.0-ndb

--- 1.7/mysql-test/r/ndb_restore.result	2007-04-13 01:37:22 +02:00
+++ 1.8/mysql-test/r/ndb_restore.result	2007-06-17 19:27:18 +02:00
@@ -129,6 +129,13 @@
 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

--- 1.12/mysql-test/t/ndb_restore.test	2007-04-13 01:37:22 +02:00
+++ 1.13/mysql-test/t/ndb_restore.test	2007-06-17 19:27:18 +02:00
@@ -165,10 +165,10 @@
 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;