Commit 0fcf49b4 authored by unknown's avatar unknown
Browse files

Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new 

into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new


mysql-test/t/disabled.def:
  Auto merged
parents 4ab459ce 5c207e33

include/my_base.h

+2 −0
Original line number Diff line number Diff line
@@ -159,6 +159,8 @@ enum ha_extra_function { 
    Ignore if the a tuple is not found, continue processing the

    transaction and ignore that 'row'.  Needed for idempotency

    handling on the slave



    Currently only used by NDB storage engine. Partition handler ignores flag.

  */

  HA_EXTRA_IGNORE_NO_KEY,

  HA_EXTRA_NO_IGNORE_NO_KEY,

mysql-test/ndb/ndb_config_2_node.ini

+3 −0
Original line number Diff line number Diff line
@@ -12,6 +12,9 @@ MaxNoOfAttributes= CHOOSE_MaxNoOfAttributes 
TimeBetweenGlobalCheckpoints= 500

NoOfFragmentLogFiles= 3

DiskPageBufferMemory= CHOOSE_DiskPageBufferMemory

# the following parametes just function as a small regression

# test that the parameter exists

InitialNoOfOpenFiles= 27



[ndbd]

HostName= CHOOSE_HOSTNAME_1   # hostname is a valid network adress

mysql-test/t/disabled.def

+2 −2
Original line number Diff line number Diff line
@@ -23,8 +23,8 @@ partition_03ndb : Bug#16385 
ps_7ndb                 : dbug assert in RBR mode when executing test suite

#rpl_bit_npk             : Bug#13418

rpl_ddl                 : Bug#15963 SBR does not show "Definer" correctly

rpl_ndb_2innodb         : Assert failure in ha_partition::extra()

rpl_ndb_2myisam         : Assert failure in ha_partition::extra()

rpl_ndb_2innodb         : assertion in get_parts_for_update()

rpl_ndb_2myisam         : assertion in get_parts_for_update()

rpl_ndb_auto_inc        : Bug#17086

#rpl_ndb_basic           : Bug#16228 [IN REVIEW]

rpl_ndb_blob            : interferes with following tests, causing hang

sql/ha_partition.cc

+9 −0
Original line number Diff line number Diff line
@@ -4709,6 +4709,15 @@ int ha_partition::extra(enum ha_extra_function operation) 
    m_extra_cache_size= 0;

    DBUG_RETURN(loop_extra(operation));

  }

  case HA_EXTRA_IGNORE_NO_KEY:

  case HA_EXTRA_NO_IGNORE_NO_KEY:

  {

    /*

      Ignore as these are specific to NDB for handling

      idempotency

     */

    break;

  }

  default:

  {

    /* Temporary crash to discover what is wrong */

storage/ndb/src/kernel/blocks/ndbfs/Ndbfs.cpp

+4 −2
Original line number Diff line number Diff line
@@ -108,9 +108,11 @@ Ndbfs::execREAD_CONFIG_REQ(Signal* signal) 


  m_maxFiles = 40;

  ndb_mgm_get_int_parameter(p, CFG_DB_MAX_OPEN_FILES, &m_maxFiles);

	        

  Uint32 noIdleFiles = 27;

  ndb_mgm_get_int_parameter(p, CFG_DB_INITIAL_OPEN_FILES, &noIdleFiles);

  if (noIdleFiles > m_maxFiles)

    m_maxFiles = noIdleFiles;

  // Create idle AsyncFiles

  Uint32 noIdleFiles = m_maxFiles > 27  ? 27 : m_maxFiles ;

  for (Uint32 i = 0; i < noIdleFiles; i++){

    theIdleFiles.push_back(createAsyncFile());

  }