bk commit into 5.0 tree (istruewing:1.2296) BUG#8283

[ingo]

Below is the list of changes that have just been committed into a local
5.0 repository of istruewing. When istruewing does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2006-10-09 22:16:22+02:00, istruewing@stripped +1 -0
  Bug#8283 - OPTIMIZE TABLE causes data loss
  After merge fix. MyISAM version 10.

  mysql-test/r/myisam.result@stripped, 2006-10-09 22:16:15+02:00, istruewing@stripped +4 -4
    Bug#8283 - OPTIMIZE TABLE causes data loss
    After merge fix. MyISAM version 10.

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	istruewing
# Host:	chilla.local
# Root:	/home/mydev/mysql-5.0-bug8283

--- 1.88/mysql-test/r/myisam.result	2006-10-09 22:16:37 +02:00
+++ 1.89/mysql-test/r/myisam.result	2006-10-09 22:16:37 +02:00
@@ -841,7 +841,7 @@ _id
 DELETE FROM t1 WHERE _id < 8;
 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	Dynamic	2	#	#	#	#	140	#	#	#	#	#	#		
+t1	MyISAM	10	Dynamic	2	#	#	#	#	140	#	#	#	#	#	#		
 CHECK TABLE t1 EXTENDED;
 Table	Op	Msg_type	Msg_text
 test.t1	check	status	OK
@@ -853,7 +853,7 @@ Table	Op	Msg_type	Msg_text
 test.t1	check	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	9	Dynamic	2	#	#	#	#	0	#	#	#	#	#	#		
+t1	MyISAM	10	Dynamic	2	#	#	#	#	0	#	#	#	#	#	#		
 SELECT _id FROM t1;
 _id
 8
@@ -900,7 +900,7 @@ _id
 DELETE FROM t1 WHERE _id < 8;
 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	Dynamic	2	#	#	#	#	140	#	#	#	#	#	#		
+t1	MyISAM	10	Dynamic	2	#	#	#	#	140	#	#	#	#	#	#		
 CHECK TABLE t1 EXTENDED;
 Table	Op	Msg_type	Msg_text
 test.t1	check	status	OK
@@ -912,7 +912,7 @@ Table	Op	Msg_type	Msg_text
 test.t1	check	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	9	Dynamic	2	#	#	#	#	140	#	#	#	#	#	#		
+t1	MyISAM	10	Dynamic	2	#	#	#	#	140	#	#	#	#	#	#		
 SELECT _id FROM t1;
 _id
 8