bk commit into 5.0 tree (jimw:1.1912)

[Jim Winstead]

Below is the list of changes that have just been committed into a local
5.0 repository of jimw. When jimw 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.1912 05/05/25 14:57:51 jimw@stripped +5 -0
  Merge mysql.com:/home/jimw/my/mysql-5.0-build
  into  mysql.com:/home/jimw/my/mysql-5.0-clean

  sql/unireg.cc
    1.60 05/05/25 14:57:48 jimw@stripped +0 -0
    Auto merged

  sql/sql_yacc.yy
    1.381 05/05/25 14:57:48 jimw@stripped +0 -0
    Auto merged

  sql/sql_lex.h
    1.179 05/05/25 14:57:47 jimw@stripped +0 -0
    Auto merged

  mysys/my_getwd.c
    1.16 05/05/25 14:57:47 jimw@stripped +0 -4
    Auto merged

  myisammrg/myrg_open.c
    1.30 05/05/25 14:57:47 jimw@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:	jimw
# Host:	rama.(none)
# Root:	/home/jimw/my/mysql-5.0-clean/RESYNC

--- 1.178/sql/sql_lex.h	2005-05-23 11:38:07 -07:00
+++ 1.179/sql/sql_lex.h	2005-05-25 14:57:47 -07:00
@@ -635,6 +635,7 @@
 #define ALTER_CHANGE_COLUMN_DEFAULT 256
 #define ALTER_KEYS_ONOFF        512
 #define ALTER_CONVERT          1024
+#define ALTER_FORCE		2048
 
 typedef struct st_alter_info
 {

--- 1.380/sql/sql_yacc.yy	2005-05-20 08:47:01 -07:00
+++ 1.381/sql/sql_yacc.yy	2005-05-25 14:57:48 -07:00
@@ -3512,6 +3512,10 @@
 	    LEX *lex=Lex;
 	    lex->alter_info.flags|= ALTER_OPTIONS;
 	  }
+	| FORCE_SYM
+	  {
+	    Lex->alter_info.flags|= ALTER_FORCE;
+	   }
 	| order_clause
 	  {
 	    LEX *lex=Lex;

--- 1.59/sql/unireg.cc	2005-05-19 05:06:45 -07:00
+++ 1.60/sql/unireg.cc	2005-05-25 14:57:48 -07:00
@@ -756,8 +756,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);