Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-ndb (7bf1913d) · Commits · Software / OSDI20 Artifacts / mariadb

include/my_base.h

+8 −0

Original line number	Diff line number	Diff line
		@@ -96,6 +96,14 @@ enum ha_key_alg {
		HA_KEY_ALG_FULLTEXT= 4 /* FULLTEXT (MyISAM tables) */
		};

		/* Storage media types */

		enum ha_storage_media {
		HA_SM_DEFAULT= 0, /* Not specified (engine default) */
		HA_SM_DISK= 1, /* DISK storage */
		HA_SM_MEMORY= 2 /* MAIN MEMORY storage */
		};

		/* The following is parameter to ha_extra() */

		enum ha_extra_function {

mysql-test/r/ndb_dd_alter.result

+10 −4

Original line number	Diff line number	Diff line
		@@ -282,7 +282,13 @@ a1
		18
		19
		20
		SELECT * FROM information_schema.partitions WHERE table_name= 't1' AND partition_name = 'p0';
		TABLE_CATALOG TABLE_SCHEMA TABLE_NAME PARTITION_NAME SUBPARTITION_NAME PARTITION_ORDINAL_POSITION SUBPARTITION_ORDINAL_POSITION PARTITION_METHOD SUBPARTITION_METHOD PARTITION_EXPRESSION SUBPARTITION_EXPRESSION PARTITION_DESCRIPTION TABLE_ROWS AVG_ROW_LENGTH DATA_LENGTH MAX_DATA_LENGTH INDEX_LENGTH DATA_FREE CREATE_TIME UPDATE_TIME CHECK_TIME CHECKSUM PARTITION_COMMENT NODEGROUP TABLESPACE_NAME
		NULL test t1 p0 NULL 1 NULL KEY NULL NULL NULL 0 0 0 NULL 0 0 NULL NULL NULL NULL default default ts
		ALTER TABLE test.t1 ADD a2 FLOAT, ADD a3 DOUBLE;
		SELECT * FROM information_schema.partitions WHERE table_name= 't1' AND partition_name = 'p0';
		TABLE_CATALOG TABLE_SCHEMA TABLE_NAME PARTITION_NAME SUBPARTITION_NAME PARTITION_ORDINAL_POSITION SUBPARTITION_ORDINAL_POSITION PARTITION_METHOD SUBPARTITION_METHOD PARTITION_EXPRESSION SUBPARTITION_EXPRESSION PARTITION_DESCRIPTION TABLE_ROWS AVG_ROW_LENGTH DATA_LENGTH MAX_DATA_LENGTH INDEX_LENGTH DATA_FREE CREATE_TIME UPDATE_TIME CHECK_TIME CHECKSUM PARTITION_COMMENT NODEGROUP TABLESPACE_NAME
		NULL test t1 p0 NULL 1 NULL KEY NULL NULL NULL 0 0 0 NULL 0 0 NULL NULL NULL NULL default default ts
		SELECT * FROM test.t1 ORDER BY a1;
		a1 a2 a3
		1 2.2345 20000001
		@@ -369,7 +375,7 @@ t1 CREATE TABLE `t1` (
		`a13` text,
		`a14` blob,
		PRIMARY KEY (`a1`)
		) ENGINE=ndbcluster DEFAULT CHARSET=latin1
		) /!50100 TABLESPACE ts STORAGE DISK / ENGINE=ndbcluster DEFAULT CHARSET=latin1
		ALTER TABLE test.t1 ADD INDEX a2_i (a2), ADD INDEX a3_i (a3);
		SHOW CREATE TABLE test.t1;
		Table Create Table
		@@ -391,7 +397,7 @@ t1 CREATE TABLE `t1` (
		PRIMARY KEY (`a1`),
		KEY `a2_i` (`a2`),
		KEY `a3_i` (`a3`)
		) ENGINE=ndbcluster DEFAULT CHARSET=latin1
		) /!50100 TABLESPACE ts STORAGE DISK / ENGINE=ndbcluster DEFAULT CHARSET=latin1
		ALTER TABLE test.t1 DROP INDEX a2_i;
		SHOW CREATE TABLE test.t1;
		Table Create Table
		@@ -412,7 +418,7 @@ t1 CREATE TABLE `t1` (
		`a14` blob,
		PRIMARY KEY (`a1`),
		KEY `a3_i` (`a3`)
		) ENGINE=ndbcluster DEFAULT CHARSET=latin1
		) /!50100 TABLESPACE ts STORAGE DISK / ENGINE=ndbcluster DEFAULT CHARSET=latin1
		ALTER TABLE test.t1 DROP a14;
		ALTER TABLE test.t1 DROP a13;
		ALTER TABLE test.t1 DROP a12;
		@@ -432,7 +438,7 @@ t1 CREATE TABLE `t1` (
		`a4` bit(1) DEFAULT NULL,
		`a5` tinyint(4) DEFAULT NULL,
		KEY `a3_i` (`a3`)
		) ENGINE=ndbcluster DEFAULT CHARSET=latin1
		) /!50100 TABLESPACE ts STORAGE DISK / ENGINE=ndbcluster DEFAULT CHARSET=latin1
		DROP TABLE test.t1;
		ALTER TABLESPACE ts
		DROP DATAFILE './table_space/datafile.dat'

mysql-test/r/ndb_dd_disk2memory.result

+2 −2

Original line number	Diff line number	Diff line
		@@ -237,7 +237,7 @@ t2 CREATE TABLE `t2` (
		`c2` int(11) NOT NULL,
		PRIMARY KEY (`pk2`)
		) /!50100 TABLESPACE table_space1 STORAGE DISK / ENGINE=ndbcluster DEFAULT CHARSET=latin1
		ALTER TABLE test.t1 ENGINE=NDBCLUSTER;
		ALTER TABLE test.t1 STORAGE MEMORY ENGINE=NDBCLUSTER;
		SHOW CREATE TABLE test.t1;
		Table Create Table
		t1 CREATE TABLE `t1` (
		@@ -341,7 +341,7 @@ t1 CREATE TABLE `t1` (
		KEY `a2` (`a2`),
		KEY `a3` (`a3`),
		KEY `a8` (`a8`)
		) ENGINE=ndbcluster DEFAULT CHARSET=latin1
		) /!50100 TABLESPACE table_space1 STORAGE DISK / ENGINE=ndbcluster DEFAULT CHARSET=latin1
		Table Create Table
		t2 CREATE TABLE `t2` (
		`b1` smallint(6) NOT NULL,

mysql-test/r/rpl_ndb_dd_advance.result

+6 −6

Original line number	Diff line number	Diff line
		@@ -70,7 +70,7 @@ t1 CREATE TABLE `t1` (
		PRIMARY KEY (`c1`),
		KEY `t1_i` (`c2`,`c3`),
		KEY `c5` (`c5`)
		) ENGINE=ndbcluster DEFAULT CHARSET=latin1
		) /!50100 TABLESPACE ts1 STORAGE DISK / ENGINE=ndbcluster DEFAULT CHARSET=latin1
		** Show first set of ALTERs on SLAVE **
		SHOW CREATE TABLE t1;
		Table Create Table
		@@ -83,7 +83,7 @@ t1 CREATE TABLE `t1` (
		PRIMARY KEY (`c1`),
		KEY `t1_i` (`c2`,`c3`),
		KEY `c5` (`c5`)
		) ENGINE=ndbcluster DEFAULT CHARSET=latin1
		) /!50100 TABLESPACE ts1 STORAGE DISK / ENGINE=ndbcluster DEFAULT CHARSET=latin1
		** Second set of alters test 1 **
		ALTER TABLE t1 RENAME t2;
		ALTER TABLE t2 DROP INDEX c5;
		@@ -102,7 +102,7 @@ t1 CREATE TABLE `t1` (
		`c5` double DEFAULT NULL,
		PRIMARY KEY (`c1`),
		KEY `t1_i` (`c2`,`c3`)
		) ENGINE=ndbcluster DEFAULT CHARSET=latin1
		) /!50100 TABLESPACE ts1 STORAGE DISK / ENGINE=ndbcluster DEFAULT CHARSET=latin1
		** Show second set of ALTERs on SLAVE **
		SHOW CREATE TABLE t1;
		Table Create Table
		@@ -114,7 +114,7 @@ t1 CREATE TABLE `t1` (
		`c5` double DEFAULT NULL,
		PRIMARY KEY (`c1`),
		KEY `t1_i` (`c2`,`c3`)
		) ENGINE=ndbcluster DEFAULT CHARSET=latin1
		) /!50100 TABLESPACE ts1 STORAGE DISK / ENGINE=ndbcluster DEFAULT CHARSET=latin1
		** Third and last set of alters for test1 **
		ALTER TABLE t1 CHANGE c1 c1 DOUBLE;
		ALTER TABLE t1 CHANGE c2 c2 DECIMAL(10,2);
		@@ -136,7 +136,7 @@ t1 CREATE TABLE `t1` (
		`c5` double DEFAULT NULL,
		PRIMARY KEY (`c1`),
		KEY `t1_i` (`c2`)
		) ENGINE=ndbcluster DEFAULT CHARSET=latin1
		) /!50100 TABLESPACE ts1 STORAGE DISK / ENGINE=ndbcluster DEFAULT CHARSET=latin1
		SELECT * FROM t1 ORDER BY c1 LIMIT 5;
		c1 c2 c3 c5
		1 2.00 b1b1b1b1b1b1b1b1b1b1 NULL
		@@ -154,7 +154,7 @@ t1 CREATE TABLE `t1` (
		`c5` double DEFAULT NULL,
		PRIMARY KEY (`c1`),
		KEY `t1_i` (`c2`)
		) ENGINE=ndbcluster DEFAULT CHARSET=latin1
		) /!50100 TABLESPACE ts1 STORAGE DISK / ENGINE=ndbcluster DEFAULT CHARSET=latin1
		SELECT * FROM t1 where c1 = 1;
		c1 c2 c3 c5
		1 2.00 b1b1b1b1b1b1b1b1b1b1 NULL

mysql-test/t/ndb_dd_alter.test

+4 −0

Original line number	Diff line number	Diff line
		@@ -156,8 +156,12 @@ enable_query_log;

		SELECT * FROM test.t1 ORDER BY a1;

		SELECT * FROM information_schema.partitions WHERE table_name= 't1' AND partition_name = 'p0';

		ALTER TABLE test.t1 ADD a2 FLOAT, ADD a3 DOUBLE;

		SELECT * FROM information_schema.partitions WHERE table_name= 't1' AND partition_name = 'p0';

		let $1=20;
		disable_query_log;
		while ($1)