bk commit into 5.1 tree (msvensson:1.2364)

[msvensson]

Below is the list of changes that have just been committed into a local
5.1 repository of msvensson. When msvensson 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, 2006-12-13 23:58:06+01:00, msvensson@neptunus.(none) +4 -0
  Reenable rpl_ndb_sync and ndb_restore_partition by 
  adding check in "ndb_restore" not to restore schema table from old backup

  mysql-test/r/rpl_ndb_sync.result@stripped, 2006-12-13 23:58:03+01:00,
msvensson@neptunus.(none) +4 -4
    Update result file to new system  table names

  mysql-test/t/disabled.def@stripped, 2006-12-13 23:58:03+01:00, msvensson@neptunus.(none) +2
-2
    Remove fixd tests from disabled.def

  sql/ha_ndbcluster_tables.h@stripped, 2006-12-13 23:58:03+01:00, msvensson@neptunus.(none) +1
-0
    Add define for old "schema" table name, used for backward compatibility

  storage/ndb/tools/restore/Restore.cpp@stripped, 2006-12-13 23:58:03+01:00,
msvensson@neptunus.(none) +2 -0
    Add check not to restore schema table from old 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:	msvensson
# Host:	neptunus.(none)
# Root:	/home/msvensson/mysql/mysql-5.1-new-ndb

--- 1.221/mysql-test/t/disabled.def	2006-12-13 23:58:12 +01:00
+++ 1.222/mysql-test/t/disabled.def	2006-12-13 23:58:12 +01:00
@@ -16,8 +16,8 @@ concurrent_innodb        : BUG#21579 200
 ndb_autodiscover         : BUG#18952 2006-02-16 jmiller Needs to be fixed w.r.t binlog
 ndb_autodiscover2        : BUG#18952 2006-02-16 jmiller Needs to be fixed w.r.t binlog
 ndb_load                 : BUG#17233 2006-05-04 tomas failed load data from infile causes
mysqld dbug_assert, binlog not flushed
-ndb_restore_partition    : Problem with cluster/def/schema table that is in
std_data/ndb_backup51; Pekka will schdule this to someone
-rpl_ndb_sync             : Problem with cluster/def/schema table that is in
std_data/ndb_backup51; Pekka will schdule this to someone
+#ndb_restore_partition    : Problem with cluster/def/schema table that is in
std_data/ndb_backup51; Pekka will schdule this to someone
+#rpl_ndb_sync             : Problem with cluster/def/schema table that is in
std_data/ndb_backup51; Pekka will schdule this to someone
 
 partition_03ndb          : BUG#16385 2006-03-24 mikael Partitions: crash when updating a
range partitioned NDB table
 rpl_ndb_2innodb          : BUG#19227 2006-04-20 pekka pk delete apparently not replicated

--- 1.43/storage/ndb/tools/restore/Restore.cpp	2006-12-13 23:58:12 +01:00
+++ 1.44/storage/ndb/tools/restore/Restore.cpp	2006-12-13 23:58:12 +01:00
@@ -304,9 +304,11 @@ RestoreMetaData::markSysTables()
           The following is for old MySQL versions,
            before we changed the database name of the tables from
            "cluster_replication" -> "cluster" -> "mysql"
+           and later table "cluster/def/schema" -> "mysql/def/ndb_schema"
         */
         strcmp(tableName, "cluster_replication/def/" OLD_NDB_APPLY_TABLE) == 0 ||
         strcmp(tableName, "cluster/def/" OLD_NDB_APPLY_TABLE) == 0 ||
+        strcmp(tableName, "cluster/def/" OLD_NDB_SCHEMA_TABLE) == 0 ||
         strcmp(tableName, NDB_REP_DB "/def/" NDB_APPLY_TABLE) == 0 ||
         strcmp(tableName, NDB_REP_DB "/def/" NDB_SCHEMA_TABLE)== 0 )
       table->isSysTable = true;

--- 1.8/mysql-test/r/rpl_ndb_sync.result	2006-12-13 23:58:12 +01:00
+++ 1.9/mysql-test/r/rpl_ndb_sync.result	2006-12-13 23:58:12 +01:00
@@ -60,11 +60,11 @@ hex(c2)	hex(c3)	c1
 0	1	BCDEF
 1	0	CD
 0	0	DEFGHIJKL
-SELECT @the_epoch:=MAX(epoch) FROM mysql.apply_status;
+SELECT @the_epoch:=MAX(epoch) FROM mysql.ndb_apply_status;
 @the_epoch:=MAX(epoch)
 <the_epoch>
 SELECT @the_pos:=Position,@the_file:=SUBSTRING_INDEX(FILE, '/', -1)
-FROM mysql.binlog_index WHERE epoch > <the_epoch> ORDER BY epoch ASC LIMIT 1;
+FROM mysql.ndb_binlog_index WHERE epoch > <the_epoch> ORDER BY epoch ASC LIMIT
1;
 @the_pos:=Position	@the_file:=SUBSTRING_INDEX(FILE, '/', -1)
 <the_pos>	master-bin.000001
 CHANGE MASTER TO
@@ -89,8 +89,8 @@ hex(c2)	hex(c3)	c1
 DROP DATABASE ndbsynctest;
 STOP SLAVE;
 reset master;
-select * from mysql.binlog_index;
+select * from mysql.ndb_binlog_index;
 Position	File	epoch	inserts	updates	deletes	schemaops
 reset slave;
-select * from mysql.apply_status;
+select * from mysql.ndb_apply_status;
 server_id	epoch

--- 1.4/sql/ha_ndbcluster_tables.h	2006-12-13 23:58:12 +01:00
+++ 1.5/sql/ha_ndbcluster_tables.h	2006-12-13 23:58:12 +01:00
@@ -19,4 +19,5 @@
 #define NDB_REP_TABLE   "ndb_binlog_index"
 #define NDB_APPLY_TABLE "ndb_apply_status"
 #define OLD_NDB_APPLY_TABLE "apply_status"
+#define OLD_NDB_SCHEMA_TABLE "schema"
 #define NDB_SCHEMA_TABLE "ndb_schema"