Commit 15645bf5 authored by unknown's avatar unknown
Browse files

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

into  mysql.com:/home/ndbdev/jmiller/clones/mysql-5.1-new
parents ded8417d fb8376fa

mysql-test/r/ndb_dd_disk2memory.result

+4 −4
Original line number Diff line number Diff line
@@ -218,7 +218,7 @@ t2 CREATE TABLE `t2` ( 
  `b2` int(11) NOT NULL,

  `c2` int(11) NOT NULL,

  PRIMARY KEY  (`pk2`)

) ENGINE=NDBCLUSTER DEFAULT CHARSET=latin1

) ENGINE=ndbcluster DEFAULT CHARSET=latin1 PARTITION BY KEY () 

SHOW CREATE TABLE test.t1;

Table	Create Table

t1	CREATE TABLE `t1` (
@@ -226,7 +226,7 @@ t1 CREATE TABLE `t1` ( 
  `b` int(11) NOT NULL,

  `c` int(11) NOT NULL,

  PRIMARY KEY  (`pk1`)

) ENGINE=NDBCLUSTER DEFAULT CHARSET=latin1

) ENGINE=ndbcluster DEFAULT CHARSET=latin1 PARTITION BY KEY () 

ALTER TABLE test.t2 TABLESPACE table_space1 STORAGE DISK

ENGINE=NDB;

SHOW CREATE TABLE test.t2;
@@ -236,7 +236,7 @@ t2 CREATE TABLE `t2` ( 
  `b2` int(11) NOT NULL,

  `c2` int(11) NOT NULL,

  PRIMARY KEY  (`pk2`)

) ENGINE=NDBCLUSTER DEFAULT CHARSET=latin1

) ENGINE=ndbcluster DEFAULT CHARSET=latin1 PARTITION BY KEY () 

ALTER TABLE test.t1 ENGINE=NDBCLUSTER;

SHOW CREATE TABLE test.t1;

Table	Create Table
@@ -245,7 +245,7 @@ t1 CREATE TABLE `t1` ( 
  `b` int(11) NOT NULL,

  `c` int(11) NOT NULL,

  PRIMARY KEY  (`pk1`)

) ENGINE=NDBCLUSTER DEFAULT CHARSET=latin1

) ENGINE=ndbcluster DEFAULT CHARSET=latin1 PARTITION BY KEY () 



DROP TABLE test.t1;

DROP TABLE test.t2;

mysql-test/t/disabled.def

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ partition_03ndb : Bug#16385 
ndb_binlog_basic   : Results are not deterministic, Tomas will fix

rpl_ndb_basic   : Bug#16228

rpl_sp          : Bug #16456

ndb_dd_disk2memory : Bug #16466 & 16736

#ndb_dd_disk2memory : Bug #16466 

ndb_autodiscover : Needs to be fixed w.r.t binlog

ndb_autodiscover2 : Needs to be fixed w.r.t binlog

system_mysql_db : Needs fixing