Commit c23f6444 authored by unknown's avatar unknown
Browse files

A followup to Bug#6878 "Crash with engine=memory", reported as Bug#6986 

""show_check" fails on 64bit platforms": now minimal rec_length
of a HEAP table >= sizeof(void*), hence it's platform-dependant.


mysql-test/r/show_check.result:
  Fix test results for 64-bit platforms.
mysql-test/t/show_check.test:
  Ignore two more columns of output of show table status: it's different
  on 64-bit and 32-bit platforms.
parent f8c1d3fa

mysql-test/r/show_check.result

+21 −21
Original line number Diff line number Diff line
@@ -314,57 +314,57 @@ insert into t2 values (1),(2); 
insert into t3 values (1,1),(2,2);

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	HEAP	9	Fixed	2	5	#	#	#	0	NULL	NULL	NULL	NULL	latin1_swedish_ci	NULL		

t2	HEAP	9	Fixed	2	5	#	#	#	0	NULL	NULL	NULL	NULL	latin1_swedish_ci	NULL		

t3	HEAP	9	Fixed	2	9	#	#	#	0	NULL	NULL	NULL	NULL	latin1_swedish_ci	NULL		

t1	HEAP	9	Fixed	2	#	#	#	#	0	NULL	NULL	NULL	NULL	latin1_swedish_ci	NULL		

t2	HEAP	9	Fixed	2	#	#	#	#	0	NULL	NULL	NULL	NULL	latin1_swedish_ci	NULL		

t3	HEAP	9	Fixed	2	#	#	#	#	0	NULL	NULL	NULL	NULL	latin1_swedish_ci	NULL		

insert into t1 values (3),(4);

insert into t2 values (3),(4);

insert into t3 values (3,3),(4,4);

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	HEAP	9	Fixed	4	5	#	#	#	0	NULL	NULL	NULL	NULL	latin1_swedish_ci	NULL		

t2	HEAP	9	Fixed	4	5	#	#	#	0	NULL	NULL	NULL	NULL	latin1_swedish_ci	NULL		

t3	HEAP	9	Fixed	4	9	#	#	#	0	NULL	NULL	NULL	NULL	latin1_swedish_ci	NULL		

t1	HEAP	9	Fixed	4	#	#	#	#	0	NULL	NULL	NULL	NULL	latin1_swedish_ci	NULL		

t2	HEAP	9	Fixed	4	#	#	#	#	0	NULL	NULL	NULL	NULL	latin1_swedish_ci	NULL		

t3	HEAP	9	Fixed	4	#	#	#	#	0	NULL	NULL	NULL	NULL	latin1_swedish_ci	NULL		

insert into t1 values (5);

insert into t2 values (5);

insert into t3 values (5,5);

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	HEAP	9	Fixed	5	5	#	#	#	0	NULL	NULL	NULL	NULL	latin1_swedish_ci	NULL		

t2	HEAP	9	Fixed	5	5	#	#	#	0	NULL	NULL	NULL	NULL	latin1_swedish_ci	NULL		

t3	HEAP	9	Fixed	5	9	#	#	#	0	NULL	NULL	NULL	NULL	latin1_swedish_ci	NULL		

t1	HEAP	9	Fixed	5	#	#	#	#	0	NULL	NULL	NULL	NULL	latin1_swedish_ci	NULL		

t2	HEAP	9	Fixed	5	#	#	#	#	0	NULL	NULL	NULL	NULL	latin1_swedish_ci	NULL		

t3	HEAP	9	Fixed	5	#	#	#	#	0	NULL	NULL	NULL	NULL	latin1_swedish_ci	NULL		

delete from t1 where a=3;

delete from t2 where b=3;

delete from t3 where a=3;

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	HEAP	9	Fixed	4	5	#	#	#	5	NULL	NULL	NULL	NULL	latin1_swedish_ci	NULL		

t2	HEAP	9	Fixed	4	5	#	#	#	5	NULL	NULL	NULL	NULL	latin1_swedish_ci	NULL		

t3	HEAP	9	Fixed	4	9	#	#	#	9	NULL	NULL	NULL	NULL	latin1_swedish_ci	NULL		

t1	HEAP	9	Fixed	4	#	#	#	#	#	NULL	NULL	NULL	NULL	latin1_swedish_ci	NULL		

t2	HEAP	9	Fixed	4	#	#	#	#	#	NULL	NULL	NULL	NULL	latin1_swedish_ci	NULL		

t3	HEAP	9	Fixed	4	#	#	#	#	#	NULL	NULL	NULL	NULL	latin1_swedish_ci	NULL		

delete from t1;

delete from t2;

delete from t3;

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	HEAP	9	Fixed	0	5	#	#	#	0	NULL	NULL	NULL	NULL	latin1_swedish_ci	NULL		

t2	HEAP	9	Fixed	0	5	#	#	#	0	NULL	NULL	NULL	NULL	latin1_swedish_ci	NULL		

t3	HEAP	9	Fixed	0	9	#	#	#	0	NULL	NULL	NULL	NULL	latin1_swedish_ci	NULL		

t1	HEAP	9	Fixed	0	#	#	#	#	0	NULL	NULL	NULL	NULL	latin1_swedish_ci	NULL		

t2	HEAP	9	Fixed	0	#	#	#	#	0	NULL	NULL	NULL	NULL	latin1_swedish_ci	NULL		

t3	HEAP	9	Fixed	0	#	#	#	#	0	NULL	NULL	NULL	NULL	latin1_swedish_ci	NULL		

insert into t1 values (5);

insert into t2 values (5);

insert into t3 values (5,5);

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	HEAP	9	Fixed	1	5	#	#	#	0	NULL	NULL	NULL	NULL	latin1_swedish_ci	NULL		

t2	HEAP	9	Fixed	1	5	#	#	#	0	NULL	NULL	NULL	NULL	latin1_swedish_ci	NULL		

t3	HEAP	9	Fixed	1	9	#	#	#	0	NULL	NULL	NULL	NULL	latin1_swedish_ci	NULL		

t1	HEAP	9	Fixed	1	#	#	#	#	0	NULL	NULL	NULL	NULL	latin1_swedish_ci	NULL		

t2	HEAP	9	Fixed	1	#	#	#	#	0	NULL	NULL	NULL	NULL	latin1_swedish_ci	NULL		

t3	HEAP	9	Fixed	1	#	#	#	#	0	NULL	NULL	NULL	NULL	latin1_swedish_ci	NULL		

delete from t1 where a=5;

delete from t2 where b=5;

delete from t3 where a=5;

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	HEAP	9	Fixed	0	5	#	#	#	5	NULL	NULL	NULL	NULL	latin1_swedish_ci	NULL		

t2	HEAP	9	Fixed	0	5	#	#	#	5	NULL	NULL	NULL	NULL	latin1_swedish_ci	NULL		

t3	HEAP	9	Fixed	0	9	#	#	#	9	NULL	NULL	NULL	NULL	latin1_swedish_ci	NULL		

t1	HEAP	9	Fixed	0	#	#	#	#	#	NULL	NULL	NULL	NULL	latin1_swedish_ci	NULL		

t2	HEAP	9	Fixed	0	#	#	#	#	#	NULL	NULL	NULL	NULL	latin1_swedish_ci	NULL		

t3	HEAP	9	Fixed	0	#	#	#	#	#	NULL	NULL	NULL	NULL	latin1_swedish_ci	NULL		

drop table t1, t2, t3;

create database mysqltest;

show create database mysqltest;

mysql-test/t/show_check.test

+7 −7
Original line number Diff line number Diff line
@@ -228,37 +228,37 @@ CREATE TABLE t3 ( 
insert into t1 values (1),(2);

insert into t2 values (1),(2);

insert into t3 values (1,1),(2,2);

--replace_column 7 # 8 # 9 #

--replace_column 6 # 7 # 8 # 9 #

show table status;

insert into t1 values (3),(4);

insert into t2 values (3),(4);

insert into t3 values (3,3),(4,4);

--replace_column 7 # 8 # 9 #

--replace_column 6 # 7 # 8 # 9 #

show table status;

insert into t1 values (5);

insert into t2 values (5);

insert into t3 values (5,5);

--replace_column 7 # 8 # 9 #

--replace_column 6 # 7 # 8 # 9 #

show table status;

delete from t1 where a=3;

delete from t2 where b=3;

delete from t3 where a=3;

--replace_column 7 # 8 # 9 #

--replace_column 6 # 7 # 8 # 9 # 10 #

show table status;

delete from t1;

delete from t2;

delete from t3;

--replace_column 7 # 8 # 9 #

--replace_column 6 # 7 # 8 # 9 #

show table status;

insert into t1 values (5);

insert into t2 values (5);

insert into t3 values (5,5);

--replace_column 7 # 8 # 9 #

--replace_column 6 # 7 # 8 # 9 #

show table status;

delete from t1 where a=5;

delete from t2 where b=5;

delete from t3 where a=5;

--replace_column 7 # 8 # 9 #

--replace_column 6 # 7 # 8 # 9 # 10 #

show table status;



drop table t1, t2, t3;