bk commit into 5.0 tree (kent:1.1915)

[kent]

Below is the list of changes that have just been committed into a local
5.0 repository of kent. When kent 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
  1.1915 05/05/26 01:38:29 kent@stripped +3 -0
  Merge mysql.com:/Users/kent/mysql/bk/mysql-5.0-build
  into mysql.com:/Users/kent/mysql/bk/mysql-5.0

  sql/unireg.cc
    1.61 05/05/26 01:38:24 kent@stripped +0 -0
    Auto merged

  mysys/my_getwd.c
    1.16 05/05/26 01:38:23 kent@stripped +0 -4
    Auto merged

  myisammrg/myrg_open.c
    1.30 05/05/26 01:38:23 kent@stripped +0 -3
    Auto merged

# 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:	kent
# Host:	g4.boortz.dyndns.org
# Root:	/Users/kent/mysql/bk/mysql-5.0/RESYNC

--- 1.60/sql/unireg.cc	2005-05-25 17:33:26 +02:00
+++ 1.61/sql/unireg.cc	2005-05-26 01:38:24 +02:00
@@ -759,8 +759,11 @@
   }
   DBUG_ASSERT(data_offset == ((null_count + 7) / 8));
 
-  /* Fill not used startpos */
-  if (null_count)
+  /*
+    We need to set the unused bits to 1. If the number of bits is a multiple
+    of 8 there are no unused bits.
+  */
+  if (null_count & 7)
     *(null_pos + null_count / 8)|= ~(((uchar) 1 << (null_count & 7)) - 1);
 
   error=(int) my_write(file,(byte*) buff, (uint) reclength,MYF_RW);