Commit 50fe8e0c authored by unknown's avatar unknown
Browse files

Merge willster.(none):/home/stewart/Documents/MySQL/4.1/bug19914-mk2 

into  willster.(none):/home/stewart/Documents/MySQL/4.1/bug19914-mk2-merge2


sql/sql_select.cc:
  Auto merged
parents 44a882f9 9076d70e

include/mysql_com.h

+0 −3
Original line number Diff line number Diff line
@@ -26,9 +26,6 @@ 
#define USERNAME_LENGTH 16

#define SERVER_VERSION_LENGTH 60

#define SQLSTATE_LENGTH 5

#define SYSTEM_CHARSET_MBMAXLEN 3

#define NAME_BYTE_LEN   NAME_LEN*SYSTEM_CHARSET_MBMAXLEN

#define USERNAME_BYTE_LENGTH USERNAME_LENGTH*SYSTEM_CHARSET_MBMAXLEN



#define LOCAL_HOST	"localhost"

#define LOCAL_HOST_NAMEDPIPE "."

myisam/mi_check.c

+10 −4
Original line number Diff line number Diff line
@@ -1153,9 +1153,12 @@ int chk_data_link(MI_CHECK *param, MI_INFO *info,int extend) 
	      /* We don't need to lock the key tree here as we don't allow

		 concurrent threads when running myisamchk

	      */

              int search_result= (keyinfo->flag & HA_SPATIAL) ?

              int search_result=

#ifdef HAVE_RTREE_KEYS

                (keyinfo->flag & HA_SPATIAL) ?

                rtree_find_first(info, key, info->lastkey, key_length,

                                 MBR_EQUAL | MBR_DATA) : 

#endif

                _mi_search(info,keyinfo,info->lastkey,key_length,

                           SEARCH_SAME, info->s->state.key_root[key]);

              if (search_result)
@@ -1366,7 +1369,8 @@ int mi_repair(MI_CHECK *param, register MI_INFO *info, 
			   param->temp_filename);

      goto err;

    }

    if (filecopy(param,new_file,info->dfile,0L,new_header_length,

    if (new_header_length &&

        filecopy(param,new_file,info->dfile,0L,new_header_length,

		 "datafile-header"))

      goto err;

    info->s->state.dellink= HA_OFFSET_ERROR;
@@ -2063,7 +2067,8 @@ int mi_repair_by_sort(MI_CHECK *param, register MI_INFO *info, 
			   param->temp_filename);

      goto err;

    }

    if (filecopy(param, new_file,info->dfile,0L,new_header_length,

    if (new_header_length &&

        filecopy(param, new_file,info->dfile,0L,new_header_length,

		 "datafile-header"))

      goto err;

    if (param->testflag & T_UNPACK)
@@ -2431,7 +2436,8 @@ int mi_repair_parallel(MI_CHECK *param, register MI_INFO *info, 
			   param->temp_filename);

      goto err;

    }

    if (filecopy(param, new_file,info->dfile,0L,new_header_length,

    if (new_header_length &&

        filecopy(param, new_file,info->dfile,0L,new_header_length,

		 "datafile-header"))

      goto err;

    if (param->testflag & T_UNPACK)

myisam/mi_delete.c

+1 −1
Original line number Diff line number Diff line
@@ -428,7 +428,7 @@ static int del(register MI_INFO *info, register MI_KEYDEF *keyinfo, uchar *key, 
	else

	{

	  DBUG_PRINT("test",("Inserting of key when deleting"));

	  if (_mi_get_last_key(info,keyinfo,leaf_buff,keybuff,endpos,

	  if (!_mi_get_last_key(info,keyinfo,leaf_buff,keybuff,endpos,

				&tmp))

	    goto err;

	  ret_value=_mi_insert(info,keyinfo,key,leaf_buff,endpos,keybuff,

myisam/mi_dynrec.c

+130 −29
Original line number Diff line number Diff line
@@ -1091,12 +1091,41 @@ void _my_store_blob_length(byte *pos,uint pack_length,uint length) 
}





	/* Read record from datafile */

	/* Returns 0 if ok, -1 if error */

/*

  Read record from datafile.



  SYNOPSIS

    _mi_read_dynamic_record()

      info                      MI_INFO pointer to table.

      filepos                   From where to read the record.

      buf                       Destination for record.



  NOTE



    If a write buffer is active, it needs to be flushed if its contents

    intersects with the record to read. We always check if the position

    of the first byte of the write buffer is lower than the position

    past the last byte to read. In theory this is also true if the write

    buffer is completely below the read segment. That is, if there is no

    intersection. But this case is unusual. We flush anyway. Only if the

    first byte in the write buffer is above the last byte to read, we do

    not flush.



    A dynamic record may need several reads. So this check must be done

    before every read. Reading a dynamic record starts with reading the

    block header. If the record does not fit into the free space of the

    header, the block may be longer than the header. In this case a

    second read is necessary. These one or two reads repeat for every

    part of the record.



  RETURN

    0           OK

    -1          Error

*/



int _mi_read_dynamic_record(MI_INFO *info, my_off_t filepos, byte *buf)

{

  int flag;

  int block_of_record;

  uint b_type,left_length;

  byte *to;

  MI_BLOCK_INFO block_info;
@@ -1108,20 +1137,19 @@ int _mi_read_dynamic_record(MI_INFO *info, my_off_t filepos, byte *buf) 
    LINT_INIT(to);

    LINT_INIT(left_length);

    file=info->dfile;

    block_info.next_filepos=filepos;	/* for easyer loop */

    flag=block_info.second_read=0;

    block_of_record= 0;   /* First block of record is numbered as zero. */

    block_info.second_read= 0;

    do

    {

      /* A corrupted table can have wrong pointers. (Bug# 19835) */

      if (filepos == HA_OFFSET_ERROR)

        goto panic;

      if (info->opt_flag & WRITE_CACHE_USED &&

	  info->rec_cache.pos_in_file <= block_info.next_filepos &&

	  info->rec_cache.pos_in_file < filepos + MI_BLOCK_INFO_HEADER_LENGTH &&

	  flush_io_cache(&info->rec_cache))

	goto err;

      /* A corrupted table can have wrong pointers. (Bug# 19835) */

      if (block_info.next_filepos == HA_OFFSET_ERROR)

        goto panic;

      info->rec_cache.seek_not_done=1;

      if ((b_type=_mi_get_block_info(&block_info,file,

				     block_info.next_filepos))

      if ((b_type= _mi_get_block_info(&block_info, file, filepos))

	  & (BLOCK_DELETED | BLOCK_ERROR | BLOCK_SYNC_ERROR |

	     BLOCK_FATAL_ERROR))

      {
@@ -1129,9 +1157,8 @@ int _mi_read_dynamic_record(MI_INFO *info, my_off_t filepos, byte *buf) 
	  my_errno=HA_ERR_RECORD_DELETED;

	goto err;

      }

      if (flag == 0)			/* First block */

      if (block_of_record++ == 0)			/* First block */

      {

	flag=1;

	if (block_info.rec_len > (uint) info->s->base.max_pack_length)

	  goto panic;

	if (info->s->base.blobs)
@@ -1146,11 +1173,35 @@ int _mi_read_dynamic_record(MI_INFO *info, my_off_t filepos, byte *buf) 
      }

      if (left_length < block_info.data_len || ! block_info.data_len)

	goto panic;			/* Wrong linked record */

      if (my_pread(file,(byte*) to,block_info.data_len,block_info.filepos,

		   MYF(MY_NABP)))

      /* copy information that is already read */

      {

        uint offset= (uint) (block_info.filepos - filepos);

        uint prefetch_len= (sizeof(block_info.header) - offset);

        filepos+= sizeof(block_info.header);



        if (prefetch_len > block_info.data_len)

          prefetch_len= block_info.data_len;

        if (prefetch_len)

        {

          memcpy((byte*) to, block_info.header + offset, prefetch_len);

          block_info.data_len-= prefetch_len;

          left_length-= prefetch_len;

          to+= prefetch_len;

        }

      }

      /* read rest of record from file */

      if (block_info.data_len)

      {

        if (info->opt_flag & WRITE_CACHE_USED &&

            info->rec_cache.pos_in_file < filepos + block_info.data_len &&

            flush_io_cache(&info->rec_cache))

          goto err;

        if (my_read(file, (byte*) to, block_info.data_len, MYF(MY_NABP)))

          goto panic;

        left_length-=block_info.data_len;

        to+=block_info.data_len;

      }

      filepos= block_info.next_filepos;

    } while (left_length);



    info->update|= HA_STATE_AKTIV;	/* We have a aktive record */
@@ -1307,11 +1358,45 @@ static int _mi_cmp_buffer(File file, const byte *buff, my_off_t filepos, 
}





/*

  Read record from datafile.



  SYNOPSIS

    _mi_read_rnd_dynamic_record()

      info                      MI_INFO pointer to table.

      buf                       Destination for record.

      filepos                   From where to read the record.

      skip_deleted_blocks       If to repeat reading until a non-deleted

                                record is found.



  NOTE



    If a write buffer is active, it needs to be flushed if its contents

    intersects with the record to read. We always check if the position

    of the first byte of the write buffer is lower than the position

    past the last byte to read. In theory this is also true if the write

    buffer is completely below the read segment. That is, if there is no

    intersection. But this case is unusual. We flush anyway. Only if the

    first byte in the write buffer is above the last byte to read, we do

    not flush.



    A dynamic record may need several reads. So this check must be done

    before every read. Reading a dynamic record starts with reading the

    block header. If the record does not fit into the free space of the

    header, the block may be longer than the header. In this case a

    second read is necessary. These one or two reads repeat for every

    part of the record.



  RETURN

    0           OK

    != 0        Error

*/



int _mi_read_rnd_dynamic_record(MI_INFO *info, byte *buf,

				register my_off_t filepos,

				my_bool skip_deleted_blocks)

{

  int flag,info_read,save_errno;

  int block_of_record, info_read, save_errno;

  uint left_len,b_type;

  byte *to;

  MI_BLOCK_INFO block_info;
@@ -1337,7 +1422,8 @@ int _mi_read_rnd_dynamic_record(MI_INFO *info, byte *buf, 
  else

    info_read=1;				/* memory-keyinfoblock is ok */



  flag=block_info.second_read=0;

  block_of_record= 0;   /* First block of record is numbered as zero. */

  block_info.second_read= 0;

  left_len=1;

  do

  {
@@ -1360,15 +1446,15 @@ int _mi_read_rnd_dynamic_record(MI_INFO *info, byte *buf, 
    {

      if (_mi_read_cache(&info->rec_cache,(byte*) block_info.header,filepos,

			 sizeof(block_info.header),

			 (!flag && skip_deleted_blocks ? READING_NEXT : 0) |

			 READING_HEADER))

			 (!block_of_record && skip_deleted_blocks ?

                          READING_NEXT : 0) | READING_HEADER))

	goto panic;

      b_type=_mi_get_block_info(&block_info,-1,filepos);

    }

    else

    {

      if (info->opt_flag & WRITE_CACHE_USED &&

	  info->rec_cache.pos_in_file <= filepos &&

	  info->rec_cache.pos_in_file < filepos + MI_BLOCK_INFO_HEADER_LENGTH &&

	  flush_io_cache(&info->rec_cache))

	DBUG_RETURN(my_errno);

      info->rec_cache.seek_not_done=1;
@@ -1393,7 +1479,7 @@ int _mi_read_rnd_dynamic_record(MI_INFO *info, byte *buf, 
      }

      goto err;

    }

    if (flag == 0)				/* First block */

    if (block_of_record == 0)				/* First block */

    {

      if (block_info.rec_len > (uint) share->base.max_pack_length)

	goto panic;
@@ -1435,11 +1521,17 @@ int _mi_read_rnd_dynamic_record(MI_INFO *info, byte *buf, 
      {

	if (_mi_read_cache(&info->rec_cache,(byte*) to,filepos,

			   block_info.data_len,

			   (!flag && skip_deleted_blocks) ? READING_NEXT :0))

			   (!block_of_record && skip_deleted_blocks) ?

                           READING_NEXT : 0))

	  goto panic;

      }

      else

      {

        if (info->opt_flag & WRITE_CACHE_USED &&

            info->rec_cache.pos_in_file <

            block_info.filepos + block_info.data_len &&

            flush_io_cache(&info->rec_cache))

          goto err;

	/* VOID(my_seek(info->dfile,filepos,MY_SEEK_SET,MYF(0))); */

	if (my_read(info->dfile,(byte*) to,block_info.data_len,MYF(MY_NABP)))

	{
@@ -1449,7 +1541,11 @@ int _mi_read_rnd_dynamic_record(MI_INFO *info, byte *buf, 
	}

      }

    }

    if (flag++ == 0)

    /*

      Increment block-of-record counter. If it was the first block,

      remember the position behind the block for the next call.

    */

    if (block_of_record++ == 0)

    {

      info->nextpos= block_info.filepos + block_info.block_len;

      skip_deleted_blocks= 0;
@@ -1484,6 +1580,11 @@ uint _mi_get_block_info(MI_BLOCK_INFO *info, File file, my_off_t filepos) 


  if (file >= 0)

  {

    /*

      We do not use my_pread() here because we want to have the file

      pointer set to the end of the header after this function.

      my_pread() may leave the file pointer untouched.

    */

    VOID(my_seek(file,filepos,MY_SEEK_SET,MYF(0)));

    if (my_read(file,(char*) header,sizeof(info->header),MYF(0)) !=

	sizeof(info->header))

myisammrg/myrg_open.c

+8 −2
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ 
MYRG_INFO *myrg_open(const char *name, int mode, int handle_locking)

{

  int save_errno,errpos=0;

  uint files=0,i,dir_length,length,key_parts;

  uint files= 0, i, dir_length, length, key_parts, min_keys= 0;

  ulonglong file_offset=0;

  char name_buff[FN_REFLEN*2],buff[FN_REFLEN],*end;

  MYRG_INFO *m_info=0;
@@ -89,7 +89,10 @@ MYRG_INFO *myrg_open(const char *name, int mode, int handle_locking) 
    else

      fn_format(buff, buff, "", "", 0);

    if (!(isam=mi_open(buff,mode,(handle_locking?HA_OPEN_WAIT_IF_LOCKED:0))))

    {

      my_errno= HA_ERR_WRONG_MRG_TABLE_DEF;

      goto err;

    }

    if (!m_info)                                /* First file */

    {

      key_parts=isam->s->base.key_parts;
@@ -106,6 +109,7 @@ MYRG_INFO *myrg_open(const char *name, int mode, int handle_locking) 
        files= 0;

      }

      m_info->reclength=isam->s->base.reclength;

      min_keys= isam->s->base.keys;

      errpos=3;

    }

    m_info->open_tables[files].table= isam;
@@ -121,6 +125,8 @@ MYRG_INFO *myrg_open(const char *name, int mode, int handle_locking) 
    m_info->records+= isam->state->records;

    m_info->del+= isam->state->del;

    m_info->data_file_length+= isam->state->data_file_length;

    if (min_keys > isam->s->base.keys)

      min_keys= isam->s->base.keys;

    for (i=0; i < key_parts; i++)

      m_info->rec_per_key_part[i]+= (isam->s->state.rec_per_key_part[i] /

                                     m_info->tables);
@@ -138,7 +144,7 @@ MYRG_INFO *myrg_open(const char *name, int mode, int handle_locking) 
    my_errno=HA_ERR_RECORD_FILE_FULL;

    goto err;

  }

  m_info->keys= files ? isam->s->base.keys : 0;

  m_info->keys= min_keys;

  bzero((char*) &m_info->by_key,sizeof(m_info->by_key));



  /* this works ok if the table list is empty */