Commit c8f8a421 authored by unknown's avatar unknown
Browse files

Merge bk-internal.mysql.com:/home/bk/mysql-4.0 

into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-4.0
parents 0b2a28f5 030cd30d

myisam/mi_delete.c

+1 −1
Original line number Diff line number Diff line
@@ -348,7 +348,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

+129 −28
Original line number Diff line number Diff line
@@ -1095,12 +1095,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;
@@ -1112,17 +1141,16 @@ 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

    {

      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;

      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))

      {
@@ -1130,9 +1158,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)
@@ -1147,11 +1174,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 */
@@ -1308,11 +1359,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 skipp_deleted_blocks)

				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;
@@ -1338,7 +1423,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

  {
@@ -1361,15 +1447,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 && skipp_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;
@@ -1380,7 +1466,7 @@ int _mi_read_rnd_dynamic_record(MI_INFO *info, byte *buf, 
		  BLOCK_FATAL_ERROR))

    {

      if ((b_type & (BLOCK_DELETED | BLOCK_SYNC_ERROR))

	  && skipp_deleted_blocks)

	  && skip_deleted_blocks)

      {

	filepos=block_info.filepos+block_info.block_len;

	block_info.second_read=0;
@@ -1394,7 +1480,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;
@@ -1436,11 +1522,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 && skipp_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)))

	{
@@ -1450,10 +1542,14 @@ 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;

      skipp_deleted_blocks=0;

      skip_deleted_blocks= 0;

    }

    left_len-=block_info.data_len;

    to+=block_info.data_len;
@@ -1485,6 +1581,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))

myisam/mi_rkey.c

+22 −16
Original line number Diff line number Diff line
@@ -78,24 +78,18 @@ int mi_rkey(MI_INFO *info, byte *buf, int inx, const byte *key, uint key_len, 
  if (!_mi_search(info,keyinfo, key_buff, use_key_length,

		  myisam_read_vec[search_flag], info->s->state.key_root[inx]))

  {

    if (info->lastpos >= info->state->data_file_length)

    /*

      If we searching for a partial key (or using >, >=, < or <=) and

      the data is outside of the data file, we need to continue searching

      for the first key inside the data file

    */

    if (info->lastpos >= info->state->data_file_length &&

        (search_flag != HA_READ_KEY_EXACT ||

         last_used_keyseg != keyinfo->seg + keyinfo->keysegs))

    {

      do

      {

        uint not_used;

        /*

          If we are searching for an exact key, abort if we find a bigger

          key.

        */

        if (search_flag == HA_READ_KEY_EXACT &&

            (use_key_length == USE_WHOLE_KEY ||

             _mi_key_cmp(keyinfo->seg, key_buff, info->lastkey, use_key_length,

                         SEARCH_FIND, &not_used)))

        {

          my_errno= HA_ERR_END_OF_FILE;

          info->lastpos= HA_OFFSET_ERROR;

          break;

        }

        /*

          Skip rows that are inserted by other threads since we got a lock

          Note that this can only happen if we are not searching after an
@@ -107,8 +101,20 @@ int mi_rkey(MI_INFO *info, byte *buf, int inx, const byte *key, uint key_len, 
                             myisam_readnext_vec[search_flag],

                             info->s->state.key_root[inx]))

          break;

        /*

          Check that the found key does still match the search.

          _mi_search_next() delivers the next key regardless of its

          value.

        */

        if (search_flag == HA_READ_KEY_EXACT &&

            _mi_key_cmp(keyinfo->seg, key_buff, info->lastkey, use_key_length,

                        SEARCH_FIND, &not_used))

        {

          my_errno= HA_ERR_KEY_NOT_FOUND;

          info->lastpos= HA_OFFSET_ERROR;

          break;

        }

      while (info->lastpos >= info->state->data_file_length);

      } while (info->lastpos >= info->state->data_file_length);

    }

  }

  if (share->concurrent_insert)

mysql-test/r/myisam.result

+13 −0
Original line number Diff line number Diff line
@@ -487,3 +487,16 @@ a a b 
1	1	1

2	2	1

drop table t1,t2;

CREATE TABLE t1 (c1 varchar(250) NOT NULL);

CREATE TABLE t2 (c1 varchar(250) NOT NULL, PRIMARY KEY (c1));

INSERT INTO t1 VALUES ('test000001'), ('test000002'), ('test000003');

INSERT INTO t2 VALUES ('test000002'), ('test000003'), ('test000004');

LOCK TABLES t1 READ LOCAL, t2 READ LOCAL;

SELECT t1.c1 AS t1c1, t2.c1 AS t2c1 FROM t1, t2

WHERE t1.c1 = t2.c1 HAVING t1c1 != t2c1;

t1c1	t2c1

INSERT INTO t2 VALUES ('test000001'), ('test000005');

SELECT t1.c1 AS t1c1, t2.c1 AS t2c1 FROM t1, t2

WHERE t1.c1 = t2.c1 HAVING t1c1 != t2c1;

t1c1	t2c1

DROP TABLE t1,t2;

mysql-test/t/myisam.test

+18 −0
Original line number Diff line number Diff line
@@ -461,6 +461,7 @@ drop table t1; 
#

# Bug #14400  Join could miss concurrently inserted row

#

# Partial key.

create table t1 (a int not null, primary key(a));

create table t2 (a int not null, b int not null, primary key(a,b));

insert into t1 values (1),(2),(3),(4),(5),(6);
@@ -473,5 +474,22 @@ disconnect root; 
connection default;

select straight_join * from t1,t2 force index (primary) where t1.a=t2.a;

drop table t1,t2;

#

# Full key.

CREATE TABLE t1 (c1 varchar(250) NOT NULL);

CREATE TABLE t2 (c1 varchar(250) NOT NULL, PRIMARY KEY (c1));

INSERT INTO t1 VALUES ('test000001'), ('test000002'), ('test000003');

INSERT INTO t2 VALUES ('test000002'), ('test000003'), ('test000004');

LOCK TABLES t1 READ LOCAL, t2 READ LOCAL;

SELECT t1.c1 AS t1c1, t2.c1 AS t2c1 FROM t1, t2

  WHERE t1.c1 = t2.c1 HAVING t1c1 != t2c1;

connect (con1,localhost,root,,);

connection con1;

INSERT INTO t2 VALUES ('test000001'), ('test000005');

disconnect con1;

connection default;

SELECT t1.c1 AS t1c1, t2.c1 AS t2c1 FROM t1, t2

  WHERE t1.c1 = t2.c1 HAVING t1c1 != t2c1;

DROP TABLE t1,t2;



# end of 4.0 tests