Commit b97acc5d authored by unknown's avatar unknown
Browse files

Merge ssmith@bk-internal.mysql.com:/home/bk/mysql-4.1 

into  mysql.com:/home/stewart/Documents/MySQL/4.1/main
parents ce252f59 ab7ec7ee

myisam/mi_dbug.c

+2 −2
Original line number Diff line number Diff line
@@ -40,12 +40,12 @@ void _mi_print_key(FILE *stream, register HA_KEYSEG *keyseg, 
    end= key+ keyseg->length;

    if (keyseg->flag & HA_NULL_PART)

    {

      if (!*key)

      /* A NULL value is encoded by a 1-byte flag. Zero means NULL. */

      if (! *(key++))

      {

	fprintf(stream,"NULL");

	continue;

      }

      key++;

    }



    switch (keyseg->type) {

myisam/mi_rkey.c

+5 −2
Original line number Diff line number Diff line
@@ -31,8 +31,8 @@ int mi_rkey(MI_INFO *info, byte *buf, int inx, const byte *key, uint key_len, 
  HA_KEYSEG *last_used_keyseg;

  uint pack_key_length, use_key_length, nextflag;

  DBUG_ENTER("mi_rkey");

  DBUG_PRINT("enter",("base: %lx  inx: %d  search_flag: %d",

		      info,inx,search_flag));

  DBUG_PRINT("enter", ("base: %p  buf: %p  inx: %d  search_flag: %d",

                       info, buf, inx, search_flag));



  if ((inx = _mi_check_index(info,inx)) < 0)

    DBUG_RETURN(my_errno);
@@ -56,9 +56,12 @@ int mi_rkey(MI_INFO *info, byte *buf, int inx, const byte *key, uint key_len, 
  {

    if (key_len == 0)

      key_len=USE_WHOLE_KEY;

    /* Save the packed key for later use in the second buffer of lastkey. */

    key_buff=info->lastkey+info->s->base.max_key_length;

    pack_key_length=_mi_pack_key(info,(uint) inx, key_buff, (uchar*) key,

				 key_len, &last_used_keyseg);

    /* Save packed_key_length for use by the MERGE engine. */

    info->pack_key_length= pack_key_length;

    DBUG_EXECUTE("key",_mi_print_key(DBUG_FILE, keyinfo->seg,

				     key_buff, pack_key_length););

  }

myisam/mi_search.c

+13 −3
Original line number Diff line number Diff line
@@ -908,11 +908,21 @@ uint _mi_get_binary_pack_key(register MI_KEYDEF *keyinfo, uint nod_flag, 
  reg1 HA_KEYSEG *keyseg;

  uchar *start_key,*page,*page_end,*from,*from_end;

  uint length,tmp;

  DBUG_ENTER("_mi_get_binary_pack_key");



  page= *page_pos;

  page_end=page+MI_MAX_KEY_BUFF+1;

  start_key=key;



  /*

    Keys are compressed the following way:



    prefix length    Packed length of prefix for the prev key. (1 or 3 bytes)

    for each key segment:

      [is null]        Null indicator if can be null (1 byte, zero means null)

      [length]         Packed length if varlength (1 or 3 bytes)

    pointer          Reference to the data file (last_keyseg->length).

  */

  get_key_length(length,page);

  if (length)

  {
@@ -922,7 +932,7 @@ uint _mi_get_binary_pack_key(register MI_KEYDEF *keyinfo, uint nod_flag, 
                          length, keyinfo->maxlength, *page_pos));

      DBUG_DUMP("key",(char*) *page_pos,16);

      my_errno=HA_ERR_CRASHED;

      return 0;                                 /* Wrong key */

      DBUG_RETURN(0);                                 /* Wrong key */

    }

    from=key;  from_end=key+length;

  }
@@ -983,12 +993,12 @@ uint _mi_get_binary_pack_key(register MI_KEYDEF *keyinfo, uint nod_flag, 
    {

      DBUG_PRINT("error",("Error when unpacking key"));

      my_errno=HA_ERR_CRASHED;

      return 0;                                 /* Error */

      DBUG_RETURN(0);                                 /* Error */

    }

    memcpy((byte*) key,(byte*) from,(size_t) length);

    *page_pos= from+length;

  }

  return((uint) (key-start_key)+keyseg->length);

  DBUG_RETURN((uint) (key-start_key)+keyseg->length);

}

myisam/myisamdef.h

+1 −0
Original line number Diff line number Diff line
@@ -261,6 +261,7 @@ struct st_myisam_info { 
  uint	last_rkey_length;		/* Last length in mi_rkey() */

  enum ha_rkey_function last_key_func;  /* CONTAIN, OVERLAP, etc */

  uint  save_lastkey_length;

  uint  pack_key_length;                /* For MYISAMMRG */

  int	errkey;				/* Got last error on this key */

  int   lock_type;			/* How database was locked */

  int   tmp_lock_type;			/* When locked by readinfo */

myisammrg/myrg_rkey.c

+12 −5
Original line number Diff line number Diff line
@@ -44,11 +44,12 @@ int myrg_rkey(MYRG_INFO *info,byte *buf,int inx, const byte *key, 
  MYRG_TABLE *table;

  MI_INFO *mi;

  int err;

  DBUG_ENTER("myrg_rkey");

  LINT_INIT(key_buff);

  LINT_INIT(pack_key_length);



  if (_myrg_init_queue(info,inx,search_flag))

    return my_errno;

    DBUG_RETURN(my_errno);



  for (table=info->open_tables ; table != info->end_table ; table++)

  {
@@ -57,8 +58,9 @@ int myrg_rkey(MYRG_INFO *info,byte *buf,int inx, const byte *key, 
    if (table == info->open_tables)

    {

      err=mi_rkey(mi,0,inx,key,key_len,search_flag);

      /* Get the saved packed key and packed key length. */

      key_buff=(byte*) mi->lastkey+mi->s->base.max_key_length;

      pack_key_length=mi->last_rkey_length;

      pack_key_length=mi->pack_key_length;

    }

    else

    {
@@ -71,17 +73,22 @@ int myrg_rkey(MYRG_INFO *info,byte *buf,int inx, const byte *key, 
    {

      if (err == HA_ERR_KEY_NOT_FOUND)

	continue;

      return err;

      DBUG_PRINT("exit", ("err: %d", err));

      DBUG_RETURN(err);

    }

    /* adding to queue */

    queue_insert(&(info->by_key),(byte *)table);



  }



  DBUG_PRINT("info", ("tables with matches: %u", info->by_key.elements));

  if (!info->by_key.elements)

    return HA_ERR_KEY_NOT_FOUND;

    DBUG_RETURN(HA_ERR_KEY_NOT_FOUND);



  mi=(info->current_table=(MYRG_TABLE *)queue_top(&(info->by_key)))->table;

  mi->once_flags|= RRND_PRESERVE_LASTINX;

  return _myrg_mi_read_record(mi,buf);

  DBUG_PRINT("info", ("using table no: %d",

                      info->current_table - info->open_tables + 1));

  DBUG_DUMP("result key", (byte*) mi->lastkey, mi->lastkey_length);

  DBUG_RETURN(_myrg_mi_read_record(mi,buf));

}