bzr commit into mysql-5.1-telco-7.1 branch (magnus.blaudd:3068)

[Magnus Blåudd]

#At file:///home/msvensson/mysql/7.1/ based on revid:magnus.blaudd@strippedudax1qpa21

 3068 Magnus Blåudd	2009-10-10 [merge]
      Merge

    modified:
      mysql-test/suite/ndb/r/ndb_restore.result
      mysql-test/suite/ndb/t/ndb_restore.test
=== modified file 'mysql-test/suite/ndb/r/ndb_restore.result'
--- a/mysql-test/suite/ndb/r/ndb_restore.result	2009-10-09 17:04:47 +0000
+++ b/mysql-test/suite/ndb/r/ndb_restore.result	2009-10-09 18:43:30 +0000
@@ -550,7 +550,7 @@ select * from t11_c) a;
 count(*)
 1
 drop table t1_c,t3_c,t4_c,t5_c,t6_c,t7_c,t8_c,t9_c,t10_c,t11_c;
-Backup Id = 3
+Backup Id = the_backup_id
 Nodeid = 1
 Analyse node group map
 Create table `test/def/t2_c` failed: 721: Schema object with given name already exists

=== modified file 'mysql-test/suite/ndb/t/ndb_restore.test'
--- a/mysql-test/suite/ndb/t/ndb_restore.test	2009-10-09 17:04:47 +0000
+++ b/mysql-test/suite/ndb/t/ndb_restore.test	2009-10-09 18:43:30 +0000
@@ -434,6 +434,7 @@ drop table t1_c,t3_c,t4_c,t5_c,t6_c,t7_c
 --source include/ndb_backup.inc
 
 # ndb_restore should now fail, table t2_c already exists
+--replace_result $the_backup_id the_backup_id
 --error 1
 --exec $NDB_RESTORE --no-defaults --core=0 -b $the_backup_id -n 1 -m -r --ndb-nodegroup_map "(0,1)" --verbose=0 $NDB_BACKUPS-$the_backup_id 2>&1 
 

Attachment: [text/bzr-bundle] bzr/[e-mail]