bk commit into 5.1 tree (tomas:1.2685)

[tomas]

Below is the list of changes that have just been committed into a local
5.1 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-12-21 12:40:07+01:00, tomas@stripped +2 -0
  minor test correction

  mysql-test/suite/ndb/r/ndb_restore.result@stripped, 2007-12-21 12:40:04+01:00, tomas@stripped +3 -3
    minor test correction

  mysql-test/suite/ndb/t/ndb_restore.test@stripped, 2007-12-21 12:40:04+01:00, tomas@stripped +3 -3
    minor test correction

diff -Nrup a/mysql-test/suite/ndb/r/ndb_restore.result b/mysql-test/suite/ndb/r/ndb_restore.result
--- a/mysql-test/suite/ndb/r/ndb_restore.result	2007-12-20 16:36:15 +01:00
+++ b/mysql-test/suite/ndb/r/ndb_restore.result	2007-12-21 12:40:04 +01:00
@@ -488,12 +488,12 @@ DROP TABLE test.backup_info;
 drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9,t10;
 drop table if exists t2_c;
 520093696,<the_backup_id>
-select epoch from mysql.ndb_apply_status;
+select epoch from mysql.ndb_apply_status where server_id=0;
 epoch
 331
-select epoch from mysql.ndb_apply_status;
+select epoch from mysql.ndb_apply_status where server_id=0;
 epoch
 151
-select epoch > (1 << 32) from mysql.ndb_apply_status;
+select epoch > (1 << 32) from mysql.ndb_apply_status where server_id=0;
 epoch > (1 << 32)
 1
diff -Nrup a/mysql-test/suite/ndb/t/ndb_restore.test b/mysql-test/suite/ndb/t/ndb_restore.test
--- a/mysql-test/suite/ndb/t/ndb_restore.test	2007-12-20 16:36:15 +01:00
+++ b/mysql-test/suite/ndb/t/ndb_restore.test	2007-12-21 12:40:04 +01:00
@@ -413,11 +413,11 @@ drop table if exists t2_c;
 
 # ensure correct restore of epoch numbers in old versions
 --exec $NDB_TOOLS_DIR/ndb_restore --no-defaults --core=0 -e -b 1 -n 1 $MYSQL_TEST_DIR/std_data/ndb_backup50 >> $NDB_TOOLS_OUTPUT
-select epoch from mysql.ndb_apply_status;
+select epoch from mysql.ndb_apply_status where server_id=0;
 --exec $NDB_TOOLS_DIR/ndb_restore --no-defaults --core=0 -e -b 1 -n 1 $MYSQL_TEST_DIR/std_data/ndb_backup51 >> $NDB_TOOLS_OUTPUT
-select epoch from mysql.ndb_apply_status;
+select epoch from mysql.ndb_apply_status where server_id=0;
 # ensure correct restore of epoch numbers in current version
 # number hould be "big"
 --exec $NDB_TOOLS_DIR/ndb_restore --no-defaults --core=0 -e -b $the_backup_id -n 1 $NDB_BACKUP_DIR/BACKUP/BACKUP-$the_backup_id >> $NDB_TOOLS_OUTPUT
 # should evaluate to true == 1
-select epoch > (1 << 32) from mysql.ndb_apply_status;
+select epoch > (1 << 32) from mysql.ndb_apply_status where server_id=0;