Merge work:/home/bk/mysql-4.0 into hundin.mysql.fi:/my/bk/mysql-4.0

myisam/mi_check.c:
  Auto merged

myisam/mi_check.c

@@ -2503,6 +2503,10 @@ static int sort_key_read(MI_SORT_PARAM *sort_param, void *key)
     (info->s->rec_reflength+ 
      _mi_make_key(info, sort_param->key, (uchar*) key,
 		  sort_param->record, sort_param->filepos));
+#ifdef HAVE_purify
+  bzero(key+sort_param->real_key_length,
+	(sort_param->key_length-sort_param->real_key_length));
+#endif
   DBUG_RETURN(sort_write_record(sort_param));
 } /* sort_key_read */
 
@@ -2536,8 +2540,14 @@ static int sort_ft_key_read(MI_SORT_PARAM *sort_param, void *key)
     wptr=(FT_WORD*)(sort_param->wordptr);
   }
 
-  sort_param->real_key_length=info->s->rec_reflength+_ft_make_key(info,
-                              sort_param->key,key,wptr++,sort_param->filepos);
+  sort_param->real_key_length=(info->s->rec_reflength+
+			       _ft_make_key(info, sort_param->key,
+					    key, wptr++, sort_param->filepos));
+#ifdef HAVE_purify
+  if (sort_param->key_length > sort_param->real_key_length)
+    bzero(key+sort_param->real_key_length,
+	  (sort_param->key_length-sort_param->real_key_length));
+#endif
   if (!wptr->pos)
   {
     my_free((char*) sort_param->wordlist, MYF(0));
@@ -2546,10 +2556,10 @@ static int sort_ft_key_read(MI_SORT_PARAM *sort_param, void *key)
   else
     sort_param->wordptr=(void*)wptr;
 
-
   DBUG_RETURN(error);
 } /* sort_ft_key_read */
 
+
 	/* Read next record from file using parameters in sort_info */
 	/* Return -1 if end of file, 0 if ok and > 0 if error */
 

mysql-test/r/myisam.result

@@ -96,4 +96,7 @@ INSERT INTO t1 (post_text) VALUES ('ceci est un test'),('ceci est un test'),('ce
 REPAIR TABLE t1;
 Table	Op	Msg_type	Msg_text
 test.t1	repair	status	OK
+CHECK TABLE t1;
+Table	Op	Msg_type	Msg_text
+test.t1	check	status	OK
 drop table t1;

mysql-test/t/myisam.test

@@ -91,5 +91,5 @@ CREATE TABLE `t1` (
 INSERT INTO t1 (post_text) VALUES ('ceci est un test'),('ceci est un test'),('ceci est un test'),('ceci est un test'),('ceci est un test');
 
 REPAIR TABLE t1;
+CHECK TABLE t1;
 drop table t1;
-