Commit 913eed1e authored by unknown's avatar unknown
Browse files

Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-ndb 

into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/mar20/maint/51
parents 8eeb6b9d 5e429982

mysql-test/r/rpl_ndb_sync.result

+4 −4
Original line number Diff line number Diff line
@@ -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

mysql-test/t/disabled.def

+0 −3
Original line number Diff line number Diff line
@@ -16,8 +16,6 @@ concurrent_innodb : BUG#21579 2006-08-11 mleich innodb_concurrent random 
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



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
@@ -37,5 +35,4 @@ synchronization : Bug#24529 Test 'synchronization' fails on Mac pushb 


plugin                   : Bug#25659 memory leak via "plugins" test

rpl_ndb_dd_advance	 : Bug#25913 rpl_ndb_dd_advance fails randomly

ndb_alter_table		 : Bug##25774 ndb_alter_table.test fails in DBUG_ASSERT() on Linux x64

ndb_single_user          : Bug#27021 Error codes in mysqld in single user mode varies

sql/ha_ndbcluster.cc

+17 −1
Original line number Diff line number Diff line
@@ -4822,7 +4822,8 @@ int ha_ndbcluster::create(const char *name, 
    if ((my_errno= create_ndb_column(col, field, create_info)))

      DBUG_RETURN(my_errno);

 

    if (create_info->storage_media == HA_SM_DISK)

    if (create_info->storage_media == HA_SM_DISK ||

        create_info->tablespace)

      col.setStorageType(NdbDictionary::Column::StorageTypeDisk);

    else

      col.setStorageType(NdbDictionary::Column::StorageTypeMemory);
@@ -7607,7 +7608,9 @@ int handle_trailing_share(NDB_SHARE *share) 
  /*

    Ndb share has not been released as it should

  */

#ifdef NOT_YET

  DBUG_ASSERT(FALSE);

#endif



  /*

    This is probably an error.  We can however save the situation
@@ -10614,10 +10617,23 @@ bool ha_ndbcluster::check_if_incompatible_data(HA_CREATE_INFO *create_info, 


  int pk= 0;

  int ai= 0;



  if (create_info->tablespace)

    create_info->storage_media = HA_SM_DISK;

  else

    create_info->storage_media = HA_SM_MEMORY;



  for (i= 0; i < table->s->fields; i++) 

  {

    Field *field= table->field[i];

    const NDBCOL *col= tab->getColumn(i);

    if (col->getStorageType() == NDB_STORAGETYPE_MEMORY && create_info->storage_media != HA_SM_MEMORY ||

        col->getStorageType() == NDB_STORAGETYPE_DISK && create_info->storage_media != HA_SM_DISK)

    {

      DBUG_PRINT("info", ("Column storage media is changed"));

      DBUG_RETURN(COMPATIBLE_DATA_NO);

    }

    

    if (field->flags & FIELD_IS_RENAMED)

    {

      DBUG_PRINT("info", ("Field has been renamed, copy table"));

sql/ha_ndbcluster_tables.h

+2 −0
Original line number Diff line number Diff line
@@ -15,7 +15,9 @@ 
*/



#define NDB_REP_DB      "mysql"

#define OLD_NDB_REP_DB  "cluster"

#define NDB_REP_TABLE   "ndb_binlog_index"

#define NDB_APPLY_TABLE "ndb_apply_status"

#define OLD_NDB_APPLY_TABLE "apply_status"

#define NDB_SCHEMA_TABLE "ndb_schema"

#define OLD_NDB_SCHEMA_TABLE "schema"

storage/ndb/include/kernel/signaldata/LqhKey.hpp

+1 −0
Original line number Diff line number Diff line
@@ -582,6 +582,7 @@ class LqhKeyRef { 
   * Reciver(s)

   */

  friend class Dbtc;      

  friend class Restore;



  /**

   * Sender(s)