bk commit into 5.0 tree (istruewing:1.2556) BUG#4692

[Ingo Struewing]

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, 2007-11-14 12:02:20+01:00, istruewing@stripped +3 -0
  Bug#4692 - DISABLE/ENABLE KEYS waste a space
  
  Post-pushbuild fix
  
  Added a purecov comment and a test for coverage of parallel
  enable keys.

  myisam/mi_check.c@stripped, 2007-11-14 12:02:18+01:00, istruewing@stripped +1 -1
    Bug#4692 - DISABLE/ENABLE KEYS waste a space
    Added purecov comment.

  mysql-test/r/myisam.result@stripped, 2007-11-14 12:02:18+01:00, istruewing@stripped +8 -0
    Bug#4692 - DISABLE/ENABLE KEYS waste a space
    Added test result.

  mysql-test/t/myisam.test@stripped, 2007-11-14 12:02:18+01:00, istruewing@stripped +6 -0
    Bug#4692 - DISABLE/ENABLE KEYS waste a space
    Added test for coverage of parallel enable keys.

diff -Nrup a/myisam/mi_check.c b/myisam/mi_check.c
--- a/myisam/mi_check.c	2007-11-06 13:41:31 +01:00
+++ b/myisam/mi_check.c	2007-11-14 12:02:18 +01:00
@@ -1487,7 +1487,7 @@ static int mi_drop_all_indexes(MI_CHECK 
   /* Remove all key blocks of this index file from key cache. */
   if ((error= flush_key_blocks(share->key_cache, share->kfile,
                                FLUSH_IGNORE_CHANGED)))
-    goto end;
+    goto end; /* purecov: inspected */
 
   /* Clear index root block pointers. */
   for (i= 0; i < share->base.keys; i++)
diff -Nrup a/mysql-test/r/myisam.result b/mysql-test/r/myisam.result
--- a/mysql-test/r/myisam.result	2007-11-06 13:41:31 +01:00
+++ b/mysql-test/r/myisam.result	2007-11-14 12:02:18 +01:00
@@ -1830,5 +1830,13 @@ ALTER TABLE t1 ENABLE KEYS;
 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	1	#	#	#	3072	#	#	#	#	#	#	#		
+# Enable keys with parallel repair
+SET @@myisam_repair_threads=2;
+ALTER TABLE t1 DISABLE KEYS;
+ALTER TABLE t1 ENABLE KEYS;
+SET @@myisam_repair_threads=1;
+CHECK TABLE t1 EXTENDED;
+Table	Op	Msg_type	Msg_text
+test.t1	check	status	OK
 DROP TABLE t1;
 End of 5.0 tests
diff -Nrup a/mysql-test/t/myisam.test b/mysql-test/t/myisam.test
--- a/mysql-test/t/myisam.test	2007-11-06 13:41:31 +01:00
+++ b/mysql-test/t/myisam.test	2007-11-14 12:02:18 +01:00
@@ -1185,6 +1185,12 @@ SHOW TABLE STATUS LIKE 't1';
 #--exec ls -log var/master-data/test/t1.MYI
 #--exec myisamchk -dvv var/master-data/test/t1.MYI
 #--exec myisamchk -iev var/master-data/test/t1.MYI
+--echo # Enable keys with parallel repair
+SET @@myisam_repair_threads=2;
+ALTER TABLE t1 DISABLE KEYS;
+ALTER TABLE t1 ENABLE KEYS;
+SET @@myisam_repair_threads=1;
+CHECK TABLE t1 EXTENDED;
 DROP TABLE t1;
 
 --echo End of 5.0 tests