Commit c8d44bd7 authored by unknown's avatar unknown
Browse files

ndb_multi.test: 

  Removed replication dependency
ndb_dd_alter.test, ndb_dd_alter.result:
  Added innodb dependency and regenerated result file
ndb_dd_sql_features.result:
  Regenerated result file


mysql-test/r/ndb_dd_alter.result:
  Added innodb dependency and regenerated result file
mysql-test/t/ndb_dd_alter.test:
  Added innodb dependency and regenerated result file
mysql-test/r/ndb_dd_sql_features.result:
  Regenerated result file
mysql-test/t/ndb_multi.test:
  Removed replication dependency
parent 58365567

mysql-test/r/ndb_dd_alter.result

+3 −3
Original line number Diff line number Diff line
@@ -76,7 +76,7 @@ t1 CREATE TABLE `t1` ( 
  `a9` varchar(255) DEFAULT NULL,

  `a10` blob,

  PRIMARY KEY (`a1`)

) TABLESPACE ts STORAGE DISK ENGINE=ndbcluster DEFAULT CHARSET=latin1

) /*!50100 TABLESPACE ts STORAGE DISK */ ENGINE=ndbcluster DEFAULT CHARSET=latin1

SELECT * FROM test.t1 ORDER BY a1;

a1	a2	a3	a4	a5	a6	a7	a8	a9	a10

1	2	2000000001	aaa1	34.2	04:03:02	2006-01-01	1971-05-28 16:55:03	bbbbbbbbbbbbb1	binary data
@@ -165,7 +165,7 @@ t1 CREATE TABLE `t1` ( 
  `a9` varchar(255) DEFAULT NULL,

  `a10` blob,

  PRIMARY KEY (`a1`)

) TABLESPACE ts STORAGE DISK ENGINE=ndbcluster DEFAULT CHARSET=latin1

) /*!50100 TABLESPACE ts STORAGE DISK */ ENGINE=ndbcluster DEFAULT CHARSET=latin1

SELECT * FROM test.t1 ORDER BY a1;

a1	a2	a3	a4	a5	a6	a7	a8	a9	a10

1	2	2000000001	aaa1	34.2	04:03:02	2006-01-01	1971-05-28 16:55:03	bbbbbbbbbbbbb1	binary data
@@ -241,7 +241,7 @@ t1 CREATE TABLE `t1` ( 
  `a9` varchar(255) DEFAULT NULL,

  `a10` blob,

  PRIMARY KEY (`a1`)

) TABLESPACE ts STORAGE DISK ENGINE=ndbcluster DEFAULT CHARSET=latin1

) /*!50100 TABLESPACE ts STORAGE DISK */ ENGINE=ndbcluster DEFAULT CHARSET=latin1

ALTER TABLE test.t1 ENGINE=MyISAM;

SHOW CREATE TABLE test.t1;

Table	Create Table

mysql-test/r/ndb_dd_sql_features.result

+4 −4
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ t1 CREATE TABLE `t1` ( 
  `a2` varchar(256) DEFAULT NULL,

  `a3` blob,

  PRIMARY KEY (`a1`)

) TABLESPACE ts1 STORAGE DISK ENGINE=ndbcluster DEFAULT CHARSET=latin1

) /*!50100 TABLESPACE ts1 STORAGE DISK */ ENGINE=ndbcluster DEFAULT CHARSET=latin1

SHOW CREATE TABLE test.t2;

Table	Create Table

t2	CREATE TABLE `t2` (
@@ -39,7 +39,7 @@ t2 CREATE TABLE `t2` ( 
  `a2` varchar(256) DEFAULT NULL,

  `a3` blob,

  PRIMARY KEY (`a1`)

) TABLESPACE ts2 STORAGE DISK ENGINE=ndbcluster DEFAULT CHARSET=latin1

) /*!50100 TABLESPACE ts2 STORAGE DISK */ ENGINE=ndbcluster DEFAULT CHARSET=latin1

INSERT INTO test.t1 VALUES (1,'111111','aaaaaaaa');

INSERT INTO test.t1 VALUES (2,'222222','bbbbbbbb');

SELECT * FROM test.t1 ORDER BY a1;
@@ -94,7 +94,7 @@ t1 CREATE TABLE `t1` ( 
  `a2` varchar(5000) DEFAULT NULL,

  `a3` blob,

  PRIMARY KEY (`a1`)

) TABLESPACE ts1 STORAGE DISK ENGINE=ndbcluster DEFAULT CHARSET=latin1

) /*!50100 TABLESPACE ts1 STORAGE DISK */ ENGINE=ndbcluster DEFAULT CHARSET=latin1

SHOW CREATE TABLE test.t2;

Table	Create Table

t2	CREATE TABLE `t2` (
@@ -102,7 +102,7 @@ t2 CREATE TABLE `t2` ( 
  `a2` varchar(5000) DEFAULT NULL,

  `a3` blob,

  PRIMARY KEY (`a1`)

) TABLESPACE ts2 STORAGE DISK ENGINE=ndbcluster DEFAULT CHARSET=latin1

) /*!50100 TABLESPACE ts2 STORAGE DISK */ ENGINE=ndbcluster DEFAULT CHARSET=latin1

INSERT INTO test.t1 VALUES (1,@vc1,@d1);

INSERT INTO test.t1 VALUES (2,@vc2,@b1);

INSERT INTO test.t1 VALUES (3,@vc3,@d2);

mysql-test/t/ndb_dd_alter.test

+1 −0
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ 
##############################################################



-- source include/have_ndb.inc

-- source include/have_innodb.inc

-- source include/not_embedded.inc



--disable_warnings

mysql-test/t/ndb_multi.test

+0 −1
Original line number Diff line number Diff line 
-- source include/have_ndb.inc

-- source include/have_multi_ndb.inc

-- source include/not_embedded.inc

-- source include/have_binlog_format_statement.inc



--disable_warnings

connection server2;