Commit 486ef1ba authored by gshchepa/uchum@host.loc's avatar gshchepa/uchum@host.loc
Browse files

Merge host.loc:/work/bugs/5.0-bugteam-36055 

into  host.loc:/work/bk/5.0-bugteam
parents 1eb8991a 1e7be565

mysql-test/r/repair.result

+36 −0
Original line number Diff line number Diff line
@@ -115,3 +115,39 @@ SET myisam_repair_threads=@@global.myisam_repair_threads; 
SET myisam_sort_buffer_size=@@global.myisam_sort_buffer_size;

DROP TABLE t1;

End of 4.1 tests

# Test with a saved table from 4.1

SHOW TABLE STATUS LIKE 't1';

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	MyISAM	9	Fixed	2	5	10	21474836479	1024	0	NULL	#	#	NULL	latin1_swedish_ci	NULL		

SELECT * FROM t1;

id

1

2

# Run CHECK TABLE, it should indicate table need a REPAIR TABLE

CHECK TABLE t1 FOR UPGRADE;

Table	Op	Msg_type	Msg_text

test.t1	check	error	Table upgrade required. Please do "REPAIR TABLE `t1`" to fix it!

# REPAIR old table USE_FRM should fail

REPAIR TABLE t1 USE_FRM;

Table	Op	Msg_type	Msg_text

t1	repair	error	Failed reparing incompatible .FRM file

# Run REPAIR TABLE to upgrade .frm file

REPAIR TABLE t1;

Table	Op	Msg_type	Msg_text

test.t1	repair	status	OK

SHOW TABLE STATUS LIKE 't1';

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	MyISAM	10	Fixed	2	7	14	1970324836974591	1024	0	NULL	#	#	NULL	latin1_swedish_ci	NULL		

SELECT * FROM t1;

id

1

2

REPAIR TABLE t1 USE_FRM;

Table	Op	Msg_type	Msg_text

test.t1	repair	warning	Number of rows changed from 0 to 2

test.t1	repair	status	OK

SELECT * FROM t1;

id

1

2

DROP TABLE t1;

mysql-test/std_data/bug36055.MYD

0 → 100644
+10 B

File added.

Preview suppressed by a .gitattributes entry or the file's encoding is unsupported.

View file

mysql-test/std_data/bug36055.MYI

0 → 100644
+1 KiB

File added.

Preview suppressed by a .gitattributes entry or the file's encoding is unsupported.

View file

mysql-test/std_data/bug36055.frm

0 → 100644
+8.36 KiB

File added.

Preview suppressed by a .gitattributes entry or the file's encoding is unsupported.

View file

mysql-test/t/repair.test

+30 −0
Original line number Diff line number Diff line
@@ -113,3 +113,33 @@ SET myisam_sort_buffer_size=@@global.myisam_sort_buffer_size; 
DROP TABLE t1;



--echo End of 4.1 tests



#

# BUG#36055 - mysql_upgrade doesn't really 'upgrade' tables

#



--echo # Test with a saved table from 4.1

--copy_file std_data/bug36055.frm $MYSQLTEST_VARDIR/master-data/test/t1.frm

--copy_file std_data/bug36055.MYD $MYSQLTEST_VARDIR/master-data/test/t1.MYD

--copy_file std_data/bug36055.MYI $MYSQLTEST_VARDIR/master-data/test/t1.MYI



--replace_column 12 # 13 #

SHOW TABLE STATUS LIKE 't1';

SELECT * FROM t1;



--echo # Run CHECK TABLE, it should indicate table need a REPAIR TABLE

CHECK TABLE t1 FOR UPGRADE;



--echo # REPAIR old table USE_FRM should fail

REPAIR TABLE t1 USE_FRM;



--echo # Run REPAIR TABLE to upgrade .frm file

REPAIR TABLE t1;

--replace_column 12 # 13 #

SHOW TABLE STATUS LIKE 't1';

SELECT * FROM t1;



REPAIR TABLE t1 USE_FRM;

SELECT * FROM t1;



DROP TABLE t1;