MySQL Lists are EOL. Please join:

List:Commits« Previous MessageNext Message »
From:tomas Date:April 24 2006 2:05pm
Subject:bk commit into 5.1 tree (tomas:1.2359) BUG#18935
View as plain text  
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
  1.2359 06/04/24 16:05:02 tomas@stripped +2 -0
  Bug #18935 restore of apply_status table fails using old ndb backup

  mysql-test/t/ndb_restore.test
    1.19 06/04/24 16:04:56 tomas@stripped +4 -2
    Bug #18935 restore of apply_status table fails using old ndb backup

  mysql-test/r/ndb_restore.result
    1.14 06/04/24 16:04:56 tomas@stripped +6 -0
    Bug #18935 restore of apply_status table fails using old ndb backup

# 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:	poseidon.ndb.mysql.com
# Root:	/home/tomas/mysql-5.1-new

--- 1.13/mysql-test/r/ndb_restore.result	2006-04-21 01:39:26 +02:00
+++ 1.14/mysql-test/r/ndb_restore.result	2006-04-24 16:04:56 +02:00
@@ -528,6 +528,9 @@
 SYSTEM_VALUES_ID	VALUE
 0	4767
 1	6
+SELECT * FROM cluster.apply_status WHERE server_id=0;
+server_id	epoch
+0	314
 TRUNCATE GL;
 TRUNCATE ACCOUNT;
 TRUNCATE TRANSACTION;
@@ -579,4 +582,7 @@
 SYSTEM_VALUES_ID	VALUE
 0	2297
 1	5
+SELECT * FROM cluster.apply_status WHERE server_id=0;
+server_id	epoch
+0	331
 DROP DATABASE BANK;

--- 1.18/mysql-test/t/ndb_restore.test	2006-04-21 01:39:26 +02:00
+++ 1.19/mysql-test/t/ndb_restore.test	2006-04-24 16:04:56 +02:00
@@ -384,12 +384,13 @@
 CREATE DATABASE BANK default charset=latin1 default collate=latin1_bin;
 USE BANK;
 --exec $NDB_TOOLS_DIR/ndb_restore --no-defaults -b 1 -n 1 -p 1 -m -r $MYSQL_TEST_DIR/std_data/ndb_backup51 >> $NDB_TOOLS_OUTPUT
---exec $NDB_TOOLS_DIR/ndb_restore --no-defaults -b 1 -n 2 -p 1 -r $MYSQL_TEST_DIR/std_data/ndb_backup51 >> $NDB_TOOLS_OUTPUT
+--exec $NDB_TOOLS_DIR/ndb_restore --no-defaults -e -b 1 -n 2 -p 1 -r $MYSQL_TEST_DIR/std_data/ndb_backup51 >> $NDB_TOOLS_OUTPUT
 SHOW TABLES;
 SELECT * FROM GL            ORDER BY TIME,ACCOUNT_TYPE;
 SELECT * FROM ACCOUNT       ORDER BY ACCOUNT_ID;
 SELECT COUNT(*) FROM TRANSACTION;
 SELECT * FROM SYSTEM_VALUES ORDER BY SYSTEM_VALUES_ID;
+SELECT * FROM cluster.apply_status WHERE server_id=0;
 
 #
 # verify restore of 5.0 backup
@@ -402,9 +403,10 @@
 TRUNCATE SYSTEM_VALUES;
 TRUNCATE ACCOUNT_TYPE;
 --exec $NDB_TOOLS_DIR/ndb_restore --no-defaults -b 1 -n 1 -p 1 -r $MYSQL_TEST_DIR/std_data/ndb_backup50 >> $NDB_TOOLS_OUTPUT
---exec $NDB_TOOLS_DIR/ndb_restore --no-defaults -b 1 -n 2 -p 1 -r $MYSQL_TEST_DIR/std_data/ndb_backup50 >> $NDB_TOOLS_OUTPUT
+--exec $NDB_TOOLS_DIR/ndb_restore --no-defaults -e -b 1 -n 2 -p 1 -r $MYSQL_TEST_DIR/std_data/ndb_backup50 >> $NDB_TOOLS_OUTPUT
 SELECT * FROM GL            ORDER BY TIME,ACCOUNT_TYPE;
 SELECT * FROM ACCOUNT       ORDER BY ACCOUNT_ID;
 SELECT COUNT(*) FROM TRANSACTION;
 SELECT * FROM SYSTEM_VALUES ORDER BY SYSTEM_VALUES_ID;
+SELECT * FROM cluster.apply_status WHERE server_id=0;
 DROP DATABASE BANK;
Thread
bk commit into 5.1 tree (tomas:1.2359) BUG#18935tomas24 Apr