updated show table status usage in ndb tests to become independent on ndb cluster run (fbba2390) · 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 0 0 0 1 NULL NULL NULL latin1_swedish_ci NULL number_of_replicas: 2
		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 131072 0 0 0 101 NULL NULL NULL latin1_swedish_ci NULL number_of_replicas: 2
		t1 ndbcluster 10 Dynamic 9 96 # # 0 # 101 # # # 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 131072 0 0 0 102 NULL NULL NULL latin1_swedish_ci NULL number_of_replicas: 2
		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 131072 0 0 0 103 NULL NULL NULL latin1_swedish_ci NULL number_of_replicas: 2
		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
		@@ -144,8 +144,8 @@ Handler_discover 1
		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 9 Fixed 1 260 # # # 0 NULL # # NULL # NULL
		t7 ndbcluster 9 Fixed 1 276 # # # 0 NULL # # NULL # NULL number_of_replicas: 2
		t6 MyISAM 9 Fixed 1 260 # # # 0 NULL # # NULL # NULL #
		t7 ndbcluster 9 Fixed 1 276 # # # 0 NULL # # NULL # NULL #
		show status like 'handler_discover%';
		Variable_name Value
		Handler_discover 2

mysql-test/t/ndb_alter_table.test

+4 −0

Original line number	Diff line number	Diff line
		@@ -47,10 +47,12 @@ col3 varchar (20) not null,
		col4 varchar(4) not null,
		col5 enum('PENDING', 'ACTIVE', 'DISABLED') not null,
		col6 int not null, to_be_deleted int) ENGINE=ndbcluster;
		--replace_column 7 # 8 # 10 # 12 # 13 # 14 # 18 #
		show table status;
		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);
		--replace_column 7 # 8 # 10 # 12 # 13 # 14 # 18 #
		show table status;
		select * from t1 order by col1;
		alter table t1
		@@ -59,9 +61,11 @@ add column col7 varchar(30) not null after col5,
		add column col8 datetime not null, drop column to_be_deleted,
		change column col2 fourth varchar(30) not null after col3,
		modify column col6 int not null first;
		--replace_column 7 # 8 # 10 # 12 # 13 # 14 # 18 #
		show table status;
		select * from t1 order by col1;
		insert into t1 values (2, NULL,4,3,5,99,"PENDING","EXTRA",'2004-01-01 00:00:00');
		--replace_column 7 # 8 # 10 # 12 # 13 # 14 # 18 #
		show table status;
		select * from t1 order by col1;
		delete from t1;

mysql-test/t/ndb_autodiscover.test

+1 −1

Original line number	Diff line number	Diff line
		@@ -176,7 +176,7 @@ show status like 'handler_discover%';
		flush tables;
		system rm var/master-data/test/t7.frm ;

		--replace_column 7 # 8 # 9 # 12 # 13 # 15 #
		--replace_column 7 # 8 # 9 # 12 # 13 # 15 # 18 #
		show table status;
		show status like 'handler_discover%';