Commit 045d42e5 authored by unknown's avatar unknown
Browse files

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

into  shellback.(none):/home/msvensson/mysql/mysql-5.1
parents 0ea46d9c 9d9ac1b0

include/m_ctype.h

+0 −1
Original line number Diff line number Diff line
@@ -56,7 +56,6 @@ typedef struct uni_ctype_st 


extern MY_UNI_CTYPE my_uni_ctype[256];





/* wm_wc and wc_mb return codes */

#define MY_CS_ILSEQ	0     /* Wrong by sequence: wb_wc                   */

#define MY_CS_ILUNI	0     /* Cannot encode Unicode to charset: wc_mb    */

mysql-test/t/disabled.def

+2 −2
Original line number Diff line number Diff line
@@ -27,8 +27,8 @@ 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

rpl_ndb_blob2           : interferes with following tests, causing hang

#rpl_ndb_blob            : interferes with following tests, causing hang

#rpl_ndb_blob2           : interferes with following tests, causing hang

rpl_ndb_ddl             : master hangs

#rpl_ndb_delete_nowhere  : Bug#17400: delete & update of rows in table without pk fails

rpl_ndb_innodb2ndb      : Bug#18261: Cluster Replication: tests rpl_ndb_xxx2ndb fails

sql/ha_ndbcluster_binlog.cc

+9 −6
Original line number Diff line number Diff line
@@ -765,25 +765,28 @@ static int ndbcluster_create_schema_table(THD *thd) 
void ndbcluster_setup_binlog_table_shares(THD *thd)

{

  int done_find_all_files= 0;

  if (!apply_status_share &&

      ndbcluster_check_apply_status_share() == 0)

  if (!schema_share &&

      ndbcluster_check_schema_share() == 0)

  {

    if (!done_find_all_files)

    {

      ndbcluster_find_all_files(thd);

      done_find_all_files= 1;

    }

    ndbcluster_create_apply_status_table(thd);

    ndbcluster_create_schema_table(thd);

    // always make sure we create the 'schema' first

    if (!schema_share)

      return;

  }

  if (!schema_share &&

      ndbcluster_check_schema_share() == 0)

  if (!apply_status_share &&

      ndbcluster_check_apply_status_share() == 0)

  {

    if (!done_find_all_files)

    {

      ndbcluster_find_all_files(thd);

      done_find_all_files= 1;

    }

    ndbcluster_create_schema_table(thd);

    ndbcluster_create_apply_status_table(thd);

  }

}

storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp

+1 −1
Original line number Diff line number Diff line
@@ -1303,7 +1303,7 @@ NdbDictionaryImpl::fetchGlobalTableImpl(const BaseString& internalTableName) 
      int ret = getBlobTables(*impl);

      if (ret != 0) {

        delete impl;

        return 0;

        impl = 0;

      }

    }