Standardised on capital letters for NDBCLUSTER (7cc009fc) · Commits · Software / OSDI20 Artifacts / mariadb

mysql-test/r/ndb_alter_table.result

+4 −4

Original line number	Diff line number	Diff line
		@@ -34,13 +34,13 @@ col5 enum('PENDING', 'ACTIVE', 'DISABLED') not null,
		col6 int not null, to_be_deleted int) ENGINE=ndbcluster;
		show table status;
		Name Engine Version Row_format Rows Avg_row_length Data_length Max_data_length Index_length Data_free Auto_increment Create_time Update_time Check_time Collation Checksum Create_options Comment
		t1 ndbcluster 10 Dynamic 0 0 # # 0 # 1 # # # latin1_swedish_ci NULL #
		t1 NDBCLUSTER 10 Dynamic 0 0 # # 0 # 1 # # # latin1_swedish_ci NULL #
		SET SQL_MODE=NO_AUTO_VALUE_ON_ZERO;
		insert into t1 values
		(0,4,3,5,"PENDING",1,7),(NULL,4,3,5,"PENDING",1,7),(31,4,3,5,"PENDING",1,7), (7,4,3,5,"PENDING",1,7), (NULL,4,3,5,"PENDING",1,7), (100,4,3,5,"PENDING",1,7), (99,4,3,5,"PENDING",1,7), (8,4,3,5,"PENDING",1,7), (NULL,4,3,5,"PENDING",1,7);
		show table status;
		Name Engine Version Row_format Rows Avg_row_length Data_length Max_data_length Index_length Data_free Auto_increment Create_time Update_time Check_time Collation Checksum Create_options Comment
		t1 ndbcluster 10 Dynamic 9 96 # # 0 # 102 # # # latin1_swedish_ci NULL #
		t1 NDBCLUSTER 10 Dynamic 9 96 # # 0 # 102 # # # latin1_swedish_ci NULL #
		select * from t1 order by col1;
		col1 col2 col3 col4 col5 col6 to_be_deleted
		0 4 3 5 PENDING 1 7
		@@ -60,7 +60,7 @@ change column col2 fourth varchar(30) not null after col3,
		modify column col6 int not null first;
		show table status;
		Name Engine Version Row_format Rows Avg_row_length Data_length Max_data_length Index_length Data_free Auto_increment Create_time Update_time Check_time Collation Checksum Create_options Comment
		t1 ndbcluster 10 Dynamic 9 152 # # 0 # 102 # # # latin1_swedish_ci NULL #
		t1 NDBCLUSTER 10 Dynamic 9 152 # # 0 # 102 # # # latin1_swedish_ci NULL #
		select * from t1 order by col1;
		col6 col1 col3 fourth col4 col4_5 col5 col7 col8
		1 0 3 4 5 PENDING 0000-00-00 00:00:00
		@@ -75,7 +75,7 @@ col6 col1 col3 fourth col4 col4_5 col5 col7 col8
		insert into t1 values (2, NULL,4,3,5,99,"PENDING","EXTRA",'2004-01-01 00:00:00');
		show table status;
		Name Engine Version Row_format Rows Avg_row_length Data_length Max_data_length Index_length Data_free Auto_increment Create_time Update_time Check_time Collation Checksum Create_options Comment
		t1 ndbcluster 10 Dynamic 10 152 # # 0 # 103 # # # latin1_swedish_ci NULL #
		t1 NDBCLUSTER 10 Dynamic 10 152 # # 0 # 103 # # # latin1_swedish_ci NULL #
		select * from t1 order by col1;
		col6 col1 col3 fourth col4 col4_5 col5 col7 col8
		1 0 3 4 5 PENDING 0000-00-00 00:00:00

mysql-test/r/ndb_autodiscover.result

+2 −2

Original line number	Diff line number	Diff line
		@@ -110,7 +110,7 @@ t3 CREATE TABLE `t3` (
		`id` int(11) NOT NULL,
		`name` char(255) default NULL,
		PRIMARY KEY (`id`)
		) ENGINE=ndbcluster DEFAULT CHARSET=latin1
		) ENGINE=NDBCLUSTER DEFAULT CHARSET=latin1
		select * from t3;
		id name
		1 Explorer
		@@ -147,7 +147,7 @@ flush tables;
		show table status;
		Name Engine Version Row_format Rows Avg_row_length Data_length Max_data_length Index_length Data_free Auto_increment Create_time Update_time Check_time Collation Checksum Create_options Comment
		t6 MyISAM 10 Fixed 1 260 # # # 0 NULL # # NULL # NULL #
		t7 ndbcluster 10 Fixed 1 276 # # # 0 NULL # # NULL # NULL #
		t7 NDBCLUSTER 10 Fixed 1 276 # # # 0 NULL # # NULL # NULL #
		show status like 'handler_discover%';
		Variable_name Value
		Handler_discover 2

mysql-test/r/ndb_autodiscover2.result

+1 −1

Original line number	Diff line number	Diff line
		@@ -9,5 +9,5 @@ Variable_name Value
		Handler_discover 1
		drop table t9;
		select * from t10;
		ERROR HY000: Got error 4263 'Invalid blob attributes or invalid blob parts table' from ndbcluster
		ERROR HY000: Got error 4263 'Invalid blob attributes or invalid blob parts table' from NDBCLUSTER
		drop table t10;

mysql-test/r/ndb_bitfield.result

+1 −1

Original line number	Diff line number	Diff line
		@@ -9,7 +9,7 @@ t1 CREATE TABLE `t1` (
		`pk1` int(11) NOT NULL,
		`b` bit(64) default NULL,
		PRIMARY KEY (`pk1`)
		) ENGINE=ndbcluster DEFAULT CHARSET=latin1
		) ENGINE=NDBCLUSTER DEFAULT CHARSET=latin1
		insert into t1 values
		(0,b'1111111111111111111111111111111111111111111111111111111111111111'),
		(1,b'1000000000000000000000000000000000000000000000000000000000000000'),

mysql-test/r/ndb_insert.result

+6 −6

Original line number	Diff line number	Diff line
		@@ -441,7 +441,7 @@ INSERT INTO t1 VALUES
		(6,6,6),(7,7,7),(8,8,8),(9,9,9),(10,10,10);
		ERROR 23000: Can't write; duplicate key in table 't1'
		commit;
		ERROR HY000: Got error 4350 'Transaction already aborted' from ndbcluster
		ERROR HY000: Got error 4350 'Transaction already aborted' from NDBCLUSTER
		select * from t1 where pk1=1;
		pk1 b c
		1 1 1
		@@ -478,7 +478,7 @@ INSERT INTO t1 VALUES
		(6,6,6),(7,7,7),(8,8,8),(9,9,9),(10,10,10);
		ERROR 23000: Can't write; duplicate key in table 't1'
		SELECT * FROM t1 WHERE pk1=10;
		ERROR HY000: Got error 4350 'Transaction already aborted' from ndbcluster
		ERROR HY000: Got error 4350 'Transaction already aborted' from NDBCLUSTER
		rollback;
		select * from t1 where pk1=1;
		pk1 b c
		@@ -498,11 +498,11 @@ INSERT INTO t1 VALUES
		(6,6,6),(7,7,7),(8,8,8),(9,9,9),(10,10,10);
		ERROR 23000: Can't write; duplicate key in table 't1'
		SELECT * FROM t1 WHERE pk1=10;
		ERROR HY000: Got error 4350 'Transaction already aborted' from ndbcluster
		ERROR HY000: Got error 4350 'Transaction already aborted' from NDBCLUSTER
		SELECT * FROM t1 WHERE pk1=10;
		ERROR HY000: Got error 4350 'Transaction already aborted' from ndbcluster
		ERROR HY000: Got error 4350 'Transaction already aborted' from NDBCLUSTER
		commit;
		ERROR HY000: Got error 4350 'Transaction already aborted' from ndbcluster
		ERROR HY000: Got error 4350 'Transaction already aborted' from NDBCLUSTER
		select * from t1 where pk1=1;
		pk1 b c
		1 1 1
		@@ -521,7 +521,7 @@ INSERT INTO t1 VALUES
		(6,6,6),(7,7,7),(8,8,8),(9,9,9),(10,10,10);
		ERROR 23000: Can't write; duplicate key in table 't1'
		INSERT INTO t1 values (4000, 40, 44);
		ERROR HY000: Got error 4350 'Transaction already aborted' from ndbcluster
		ERROR HY000: Got error 4350 'Transaction already aborted' from NDBCLUSTER
		rollback;
		select * from t1 where pk1=1;
		pk1 b c