Commit 7314690b authored by unknown's avatar unknown
Browse files

Manual merge 


BitKeeper/triggers/post-commit:
  Auto merged
sql/table.cc:
  Auto merged
parents 4b7e8a8e aa3727d7

BitKeeper/triggers/post-commit

+0 −1
Original line number Diff line number Diff line
@@ -62,7 +62,6 @@ From: $FROM 
To: $INTERNALS

Subject: bk commit into $VERSION tree ($CHANGESET)$BS

$BH



Below is the list of changes that have just been committed into a local

$VERSION repository of $USER. When $USER does a push these changes will

be propagated to the main repository and, within 24 hours after the

sql/table.cc

+6 −7
Original line number Diff line number Diff line
@@ -195,7 +195,6 @@ int openfrm(const char *name, const char *alias, uint db_stat, uint prgflag, 
    goto err_not_open; /* purecov: inspected */

  bzero((char*) keyinfo,n_length);

  outparam->key_info=keyinfo;

  outparam->max_key_length= outparam->total_key_length= 0;

  key_part= my_reinterpret_cast(KEY_PART_INFO*) (keyinfo+keys);

  strpos=disk_buff+6;
@@ -251,11 +250,6 @@ int openfrm(const char *name, const char *alias, uint db_stat, uint prgflag, 
      }

      key_part->store_length=key_part->length;

    }

    set_if_bigger(outparam->max_key_length,keyinfo->key_length+

		  keyinfo->key_parts);

    outparam->total_key_length+= keyinfo->key_length;

    if (keyinfo->flags & HA_NOSAME)

      set_if_bigger(outparam->max_unique_length,keyinfo->key_length);

  }

  keynames=(char*) key_part;

  strpos+= (strmov(keynames, (char *) strpos) - keynames)+1;
@@ -627,7 +621,6 @@ int openfrm(const char *name, const char *alias, uint db_stat, uint prgflag, 
	    if (!(field->flags & BINARY_FLAG))

	      keyinfo->flags|= HA_END_SPACE_KEY;

	  }

          set_if_bigger(outparam->max_key_length, keyinfo->key_length);

	  if (i == 0 && key != primary_key)

	    field->flags |=

	      ((keyinfo->flags & HA_NOSAME) &&
@@ -686,6 +679,12 @@ int openfrm(const char *name, const char *alias, uint db_stat, uint prgflag, 
	}

      }

      keyinfo->usable_key_parts=usable_parts; // Filesort



      set_if_bigger(outparam->max_key_length,keyinfo->key_length+

		    keyinfo->key_parts);

      outparam->total_key_length+= keyinfo->key_length;

      if (keyinfo->flags & HA_NOSAME)

        set_if_bigger(outparam->max_unique_length,keyinfo->key_length);

    }

    if (primary_key < MAX_KEY &&

	(outparam->keys_in_use.is_set(primary_key)))