Commit 9dea1ccc authored by unknown's avatar unknown
Browse files

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

into  mysql.com:/home/marty/MySQL/mysql-5.1-new


storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Auto merged
mysql-test/t/disabled.def:
  Auto merged
sql/ha_ndbcluster.cc:
  Merge
parents f34e0a39 2f333aae

mysql-test/r/rpl_ndb_log.result

+4 −0
Original line number Diff line number Diff line
@@ -47,6 +47,10 @@ master-bin.000001 # Table_map 1 # table_id: # (test.t1) 
flush logs;

create table t3 (a int)ENGINE=NDB;

start slave;



let $result_pattern= '%127.0.0.1%root%master-bin.000002%slave-relay-bin.000005%Yes%Yes%0%0%None%' ;



--source include/wait_slave_status.inc

flush logs;

stop slave;

create table t2 (n int)ENGINE=NDB;

mysql-test/t/disabled.def

+1 −1
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ rpl_ndb_commit_afterflush : BUG#19328 2006-05-04 tomas Slave timeout with COM_RE 
rpl_ndb_dd_partitions    : BUG#19259 2006-04-21 rpl_ndb_dd_partitions fails on s/AMD

rpl_ndb_ddl              : BUG#18946 result file needs update + test needs to checked

rpl_ndb_innodb2ndb       : Bug #19710  	Cluster replication to partition table fails on DELETE FROM statement

rpl_ndb_log              : BUG#18947 2006-03-21 tomas CRBR: order in binlog of create table and insert (on different table) not determ

#rpl_ndb_log              : BUG#18947 2006-03-21 tomas CRBR: order in binlog of create table and insert (on different table) not determ

rpl_ndb_myisam2ndb       : Bug #19710  	Cluster replication to partition table fails on DELETE FROM statement

rpl_switch_stm_row_mixed : BUG#18590 2006-03-28 brian

rpl_row_blob_innodb      : BUG#18980 2006-04-10 kent    Test fails randomly

sql/ha_ndbcluster.cc

+15 −12
Original line number Diff line number Diff line
@@ -4661,7 +4661,7 @@ int ha_ndbcluster::create(const char *name, 
                               share->db, share->table_name,

                               m_table->getObjectId(),

                               m_table->getObjectVersion(),

                               SOT_CREATE_TABLE);

                               SOT_CREATE_TABLE, 0, 0, 1);

      break;

    }

  }
@@ -5052,7 +5052,7 @@ int ha_ndbcluster::rename_table(const char *from, const char *to) 
                               old_dbname, m_tabname,

                               ndb_table_id, ndb_table_version,

                               SOT_RENAME_TABLE,

                               m_dbname, new_tabname);

                               m_dbname, new_tabname, 1);

  }



  // If we are moving tables between databases, we need to recreate
@@ -5101,6 +5101,7 @@ ha_ndbcluster::delete_table(ha_ndbcluster *h, Ndb *ndb, 
                            const char *db,

                            const char *table_name)

{

  THD *thd= current_thd;

  DBUG_ENTER("ha_ndbcluster::ndbcluster_delete_table");

  NDBDICT *dict= ndb->getDictionary();

#ifdef HAVE_NDB_BINLOG
@@ -5132,7 +5133,7 @@ ha_ndbcluster::delete_table(ha_ndbcluster *h, Ndb *ndb, 
      ndb_table_version= h->m_table->getObjectVersion();

    }

#endif

    h->release_metadata(current_thd, ndb);

    h->release_metadata(thd, ndb);

  }

  else

  {
@@ -5198,11 +5199,11 @@ ha_ndbcluster::delete_table(ha_ndbcluster *h, Ndb *ndb, 


  if (!IS_TMP_PREFIX(table_name) && share)

  {

    ndbcluster_log_schema_op(current_thd, share,

                             current_thd->query, current_thd->query_length,

    ndbcluster_log_schema_op(thd, share,

                             thd->query, thd->query_length,

                             share->db, share->table_name,

                             ndb_table_id, ndb_table_version,

                             SOT_DROP_TABLE);

                             SOT_DROP_TABLE, 0, 0, 1);

  }

  else if (table_dropped && share && share->op) /* ndbcluster_log_schema_op

                                                   will do a force GCP */
@@ -5781,6 +5782,7 @@ int ndbcluster_drop_database_impl(const char *path) 


static void ndbcluster_drop_database(char *path)

{

  THD *thd= current_thd;

  DBUG_ENTER("ndbcluster_drop_database");

#ifdef HAVE_NDB_BINLOG

  /*
@@ -5798,9 +5800,9 @@ static void ndbcluster_drop_database(char *path) 
#ifdef HAVE_NDB_BINLOG

  char db[FN_REFLEN];

  ha_ndbcluster::set_dbname(path, db);

  ndbcluster_log_schema_op(current_thd, 0,

                           current_thd->query, current_thd->query_length,

                           db, "", 0, 0, SOT_DROP_DB);

  ndbcluster_log_schema_op(thd, 0,

                           thd->query, thd->query_length,

                           db, "", 0, 0, SOT_DROP_DB, 0, 0, 0);

#endif

  DBUG_VOID_RETURN;

}
@@ -6875,6 +6877,7 @@ static void dbug_print_open_tables() 
*/

int handle_trailing_share(NDB_SHARE *share)

{

  THD *thd= current_thd;

  static ulong trailing_share_id= 0;

  DBUG_ENTER("handle_trailing_share");
@@ -6885,7 +6888,7 @@ int handle_trailing_share(NDB_SHARE *share) 
  bzero((char*) &table_list,sizeof(table_list));

  table_list.db= share->db;

  table_list.alias= table_list.table_name= share->table_name;

  close_cached_tables(current_thd, 0, &table_list, TRUE);

  close_cached_tables(thd, 0, &table_list, TRUE);



  pthread_mutex_lock(&ndbcluster_mutex);

  if (!--share->use_count)
@@ -9989,13 +9992,13 @@ int ndbcluster_alter_tablespace(THD* thd, st_alter_tablespace *info) 
                             thd->query, thd->query_length,

                             "", info->tablespace_name,

                             0, 0,

                             SOT_TABLESPACE);

                             SOT_TABLESPACE, 0, 0, 0);

  else

    ndbcluster_log_schema_op(thd, 0,

                             thd->query, thd->query_length,

                             "", info->logfile_group_name,

                             0, 0,

                             SOT_LOGFILE_GROUP);

                             SOT_LOGFILE_GROUP, 0, 0, 0);

#endif

  DBUG_RETURN(FALSE);

sql/ha_ndbcluster_binlog.cc

+247 −195

File changed.

Preview size limit exceeded, changes collapsed.

sql/ha_ndbcluster_binlog.h

+3 −2
Original line number Diff line number Diff line
@@ -138,8 +138,9 @@ int ndbcluster_log_schema_op(THD *thd, NDB_SHARE *share, 
                             uint32 ndb_table_id,

                             uint32 ndb_table_version,

                             enum SCHEMA_OP_TYPE type,

                             const char *new_db= 0,

                             const char *new_table_name= 0);

                             const char *new_db,

                             const char *new_table_name,

                             int have_lock_open);

int ndbcluster_handle_drop_table(Ndb *ndb, const char *event_name,

                                 NDB_SHARE *share,

                                 const char *type_str);