[prev in list] [next in list] [prev in thread] [next in thread] 

List:       mysql-internals
Subject:    bk commit into 4.0 tree
From:       monty () mysql ! com
Date:       2002-06-30 23:50:32
[Download RAW message or body]

Below is the list of changes that have just been committed into a
4.0 repository of monty. When monty 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://www.mysql.com/doc/I/n/Installing_source_tree.html

ChangeSet
  1.1080 02/07/01 02:50:30 monty@hundin.mysql.fi +3 -0
  Removed purify warning

  mysql-test/t/myisam.test
    1.9 02/07/01 02:50:28 monty@hundin.mysql.fi +1 -1
    Check repaired table

  mysql-test/r/myisam.result
    1.12 02/07/01 02:50:28 monty@hundin.mysql.fi +3 -0
    Check repaired table

  myisam/mi_check.c
    1.92 02/07/01 02:50:28 monty@hundin.mysql.fi +13 -3
    Clear memory after keys to avoid warnings when using purify.
    (The keys will be written to file, so they are kind of used).

# 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:	monty
# Host:	hundin.mysql.fi
# Root:	/my/bk/mysql-4.0

--- 1.91/myisam/mi_check.c	Fri Jun 28 17:25:54 2002
+++ 1.92/myisam/mi_check.c	Mon Jul  1 02:50:28 2002
@@ -2495,6 +2495,10 @@
     (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 */
 
@@ -2528,8 +2532,14 @@
     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));
@@ -2538,9 +2548,9 @@
   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 */

--- 1.11/mysql-test/r/myisam.result	Fri Jun 28 15:06:02 2002
+++ 1.12/mysql-test/r/myisam.result	Mon Jul  1 02:50:28 2002
@@ -96,4 +96,7 @@
 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;

--- 1.8/mysql-test/t/myisam.test	Fri Jun 28 15:06:02 2002
+++ 1.9/mysql-test/t/myisam.test	Mon Jul  1 02:50:28 2002
@@ -91,5 +91,5 @@
 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;
-

---------------------------------------------------------------------
Before posting, please check:
   http://www.mysql.com/manual.php   (the manual)
   http://lists.mysql.com/           (the list archive)

To request this thread, e-mail internals-thread4001@lists.mysql.com
To unsubscribe, e-mail <internals-unsubscribe@lists.mysql.com>


[prev in list] [next in list] [prev in thread] [next in thread]