Commit 7d895024 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-ndb


mysql-test/t/disabled.def:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/ha_ndbcluster_binlog.cc:
  Auto merged
parents 5c273295 0d55b2ea

mysql-test/r/ndb_rename.result

0 → 100644
+24 −0
Original line number Diff line number Diff line 
DROP TABLE IF EXISTS t1,t2;

drop database if exists mysqltest;

CREATE TABLE t1 (

pk1 INT NOT NULL PRIMARY KEY,

attr1 INT NOT NULL,

attr2 INT,

attr3 VARCHAR(10),

INDEX i1(attr1)

) ENGINE=ndbcluster;

INSERT INTO t1 VALUES (0,0,0,"zero"),(1,1,1,"one"),(2,2,2,"two");

SELECT * FROM t1 WHERE attr1 = 1;

pk1	attr1	attr2	attr3

1	1	1	one

alter table t1 rename t2;

SELECT * FROM t2 WHERE attr1 = 1;

pk1	attr1	attr2	attr3

1	1	1	one

create database ndbtest;

alter table t2 rename ndbtest.t2;

SELECT * FROM ndbtest.t2 WHERE attr1 = 1;

pk1	attr1	attr2	attr3

1	1	1	one

drop table ndbtest.t2;

drop database ndbtest;

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

mysql-test/t/ndb_rename.test

0 → 100644
+36 −0
Original line number Diff line number Diff line 
-- source include/have_ndb.inc

-- source include/not_embedded.inc



--disable_warnings

DROP TABLE IF EXISTS t1,t2;

drop database if exists mysqltest;

--enable_warnings



#

# Table rename tests

#



#

# Create a normal table with primary key

#

CREATE TABLE t1 (

  pk1 INT NOT NULL PRIMARY KEY,

  attr1 INT NOT NULL,

  attr2 INT,

  attr3 VARCHAR(10),

  INDEX i1(attr1)

) ENGINE=ndbcluster;



INSERT INTO t1 VALUES (0,0,0,"zero"),(1,1,1,"one"),(2,2,2,"two");

SELECT * FROM t1 WHERE attr1 = 1;

alter table t1 rename t2;

SELECT * FROM t2 WHERE attr1 = 1;



create database ndbtest;

alter table t2 rename ndbtest.t2;

SELECT * FROM ndbtest.t2 WHERE attr1 = 1;



drop table ndbtest.t2;

drop database ndbtest;



# End of 4.1 tests

sql/ha_ndbcluster.cc

+50 −12
Original line number Diff line number Diff line
@@ -4648,7 +4648,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;

    }

  }
@@ -4921,13 +4921,17 @@ int ha_ndbcluster::rename_table(const char *from, const char *to) 
{

  NDBDICT *dict;

  char old_dbname[FN_HEADLEN];

  char new_dbname[FN_HEADLEN];

  char new_tabname[FN_HEADLEN];

  const NDBTAB *orig_tab;

  int result;

  bool recreate_indexes= FALSE;

  NDBDICT::List index_list;



  DBUG_ENTER("ha_ndbcluster::rename_table");

  DBUG_PRINT("info", ("Renaming %s to %s", from, to));

  set_dbname(from, old_dbname);

  set_dbname(to, new_dbname);

  set_tabname(from);

  set_tabname(to, new_tabname);
@@ -4952,6 +4956,11 @@ int ha_ndbcluster::rename_table(const char *from, const char *to) 
    DBUG_ASSERT(r == 0);

  }

#endif

  if (my_strcasecmp(system_charset_info, new_dbname, old_dbname))

  {

    dict->listIndexes(index_list, *orig_tab);    

    recreate_indexes= TRUE;

  }

  // Change current database to that of target table

  set_dbname(to);

  ndb->setDatabaseName(m_dbname);
@@ -5030,7 +5039,33 @@ 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

  // indexes

  if (recreate_indexes)

  {

    for (unsigned i = 0; i < index_list.count; i++) 

    {

        NDBDICT::List::Element& index_el = index_list.elements[i];

	// Recreate any indexes not stored in the system database

	if (my_strcasecmp(system_charset_info, 

			  index_el.database, NDB_SYSTEM_DATABASE))

	{

	  set_dbname(from);

	  ndb->setDatabaseName(m_dbname);

	  const NDBINDEX * index= dict->getIndexGlobal(index_el.name,  new_tab);

	  DBUG_PRINT("info", ("Creating index %s/%s",

			      index_el.database, index->getName()));

	  dict->createIndex(*index, new_tab);

	  DBUG_PRINT("info", ("Dropping index %s/%s",

			      index_el.database, index->getName()));

	  set_dbname(from);

	  ndb->setDatabaseName(m_dbname);

	  dict->dropIndexGlobal(*index);

	}

    }

  }

  if (share)

    free_share(&share);
@@ -5053,6 +5088,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
@@ -5084,7 +5120,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

  {
@@ -5150,11 +5186,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 */
@@ -5733,6 +5769,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

  /*
@@ -5750,9 +5787,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;

}
@@ -6831,6 +6868,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");
@@ -6841,7 +6879,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)
@@ -9944,13 +9982,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);