Commit fe8c67ef authored by unknown's avatar unknown
Browse files

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

into  chilla.local:/home/mydev/mysql-5.0-axmrg


sql/ha_ndbcluster.cc:
  Auto merged
sql/ha_ndbcluster.h:
  Auto merged
parents 8122b0ca 29741b71

heap/hp_write.c

+0 −1
Original line number Diff line number Diff line
@@ -105,7 +105,6 @@ int hp_rb_write_key(HP_INFO *info, HP_KEYDEF *keyinfo, const byte *record, 
  heap_rb_param custom_arg;

  uint old_allocated;



  info->last_pos= NULL; /* For heap_rnext/heap_rprev */

  custom_arg.keyseg= keyinfo->seg;

  custom_arg.key_length= hp_rb_make_key(keyinfo, info->recbuf, record, recpos);

  if (keyinfo->flag & HA_NOSAME)

myisam/mi_range.c

+35 −1
Original line number Diff line number Diff line
@@ -144,8 +144,42 @@ static ha_rows _mi_record_pos(MI_INFO *info, const byte *key, uint key_len, 
  if (!(nextflag & (SEARCH_FIND | SEARCH_NO_FIND | SEARCH_LAST)))

    key_len=USE_WHOLE_KEY;



  /*

    my_handler.c:mi_compare_text() has a flag 'skip_end_space'.

    This is set in my_handler.c:ha_key_cmp() in dependence on the

    compare flags 'nextflag' and the column type.



    TEXT columns are of type HA_KEYTYPE_VARTEXT. In this case the

    condition is skip_end_space= ((nextflag & (SEARCH_FIND |

    SEARCH_UPDATE)) == SEARCH_FIND).



    SEARCH_FIND is used for an exact key search. The combination

    SEARCH_FIND | SEARCH_UPDATE is used in write/update/delete

    operations with a comment like "Not real duplicates", whatever this

    means. From the condition above we can see that 'skip_end_space' is

    always false for these operations. The result is that trailing space

    counts in key comparison and hence, emtpy strings ('', string length

    zero, but not NULL) compare less that strings starting with control

    characters and these in turn compare less than strings starting with

    blanks.



    When estimating the number of records in a key range, we request an

    exact search for the minimum key. This translates into a plain

    SEARCH_FIND flag. Using this alone would lead to a 'skip_end_space'

    compare. Empty strings would be expected above control characters.

    Their keys would not be found because they are located below control

    characters.



    This is the reason that we add the SEARCH_UPDATE flag here. It makes

    the key estimation compare in the same way like key write operations

    do. Olny so we will find the keys where they have been inserted.



    Adding the flag unconditionally does not hurt as it is used in the

    above mentioned condition only. So it can safely be used together

    with other flags.

  */

  pos=_mi_search_pos(info,keyinfo,key_buff,key_len,

		     nextflag | SEARCH_SAVE_BUFF,

		     nextflag | SEARCH_SAVE_BUFF | SEARCH_UPDATE,

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

  if (pos >= 0.0)

  {

myisam/mi_search.c

+35 −7
Original line number Diff line number Diff line
@@ -924,11 +924,16 @@ uint _mi_get_binary_pack_key(register MI_KEYDEF *keyinfo, uint nod_flag, 
  /*

    Keys are compressed the following way:



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

    prefix length    Packed length of prefix common with 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)

      key segment      'length' bytes of key segment value

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



    get_key_length() is a macro. It gets the prefix length from 'page'

    and puts it into 'length'. It increments 'page' by 1 or 3, depending

    on the packed length of the prefix length.

  */

  get_key_length(length,page);

  if (length)
@@ -942,34 +947,44 @@ uint _mi_get_binary_pack_key(register MI_KEYDEF *keyinfo, uint nod_flag, 
      my_errno=HA_ERR_CRASHED;

      DBUG_RETURN(0);                                 /* Wrong key */

    }

    from=key;  from_end=key+length;

    /* Key is packed against prev key, take prefix from prev key. */

    from= key;

    from_end= key + length;

  }

  else

  {

    from=page; from_end=page_end;               /* Not packed key */

    /* Key is not packed against prev key, take all from page buffer. */

    from= page;

    from_end= page_end;

  }



  /*

    The trouble is that key is split in two parts:

     The first part is in from ...from_end-1.

     The second part starts at page

    The trouble is that key can be split in two parts:

      The first part (prefix) is in from .. from_end - 1.

      The second part starts at page.

    The split can be at every byte position. So we need to check for

    the end of the first part before using every byte.

  */

  for (keyseg=keyinfo->seg ; keyseg->type ;keyseg++)

  {

    if (keyseg->flag & HA_NULL_PART)

    {

      /* If prefix is used up, switch to rest. */

      if (from == from_end) { from=page;  from_end=page_end; }

      if (!(*key++ = *from++))

        continue;                               /* Null part */

    }

    if (keyseg->flag & (HA_VAR_LENGTH_PART | HA_BLOB_PART | HA_SPACE_PACK))

    {

      /* Get length of dynamic length key part */

      /* If prefix is used up, switch to rest. */

      if (from == from_end) { from=page;  from_end=page_end; }

      /* Get length of dynamic length key part */

      if ((length= (*key++ = *from++)) == 255)

      {

        /* If prefix is used up, switch to rest. */

        if (from == from_end) { from=page;  from_end=page_end; }

        length= (uint) ((*key++ = *from++)) << 8;

        /* If prefix is used up, switch to rest. */

        if (from == from_end) { from=page;  from_end=page_end; }

        length+= (uint) ((*key++ = *from++));

      }
@@ -989,14 +1004,26 @@ uint _mi_get_binary_pack_key(register MI_KEYDEF *keyinfo, uint nod_flag, 
    key+=length;

    from+=length;

  }

  /*

    Last segment (type == 0) contains length of data pointer.

    If we have mixed key blocks with data pointer and key block pointer,

    we have to copy both.

  */

  length=keyseg->length+nod_flag;

  if ((tmp=(uint) (from_end-from)) <= length)

  {

    /* Remaining length is less or equal max possible length. */

    memcpy(key+tmp,page,length-tmp);            /* Get last part of key */

    *page_pos= page+length-tmp;

  }

  else

  {

    /*

      Remaining length is greater than max possible length.

      This can happen only if we switched to the new key bytes already.

      'page_end' is calculated with MI_MAX_KEY_BUFF. So it can be far

      behind the real end of the key.

    */

    if (from_end != page_end)

    {

      DBUG_PRINT("error",("Error when unpacking key"));
@@ -1004,6 +1031,7 @@ uint _mi_get_binary_pack_key(register MI_KEYDEF *keyinfo, uint nod_flag, 
      my_errno=HA_ERR_CRASHED;

      DBUG_RETURN(0);                                 /* Error */

    }

    /* Copy data pointer and, if appropriate, key block pointer. */

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

    *page_pos= from+length;

  }

mysql-test/r/heap_btree.result

+27 −0
Original line number Diff line number Diff line
@@ -280,6 +280,33 @@ a 
1

1

drop table t1;

CREATE TABLE t1 (

c1 CHAR(3),

c2 INTEGER,

KEY USING BTREE(c1),

KEY USING BTREE(c2)

) ENGINE= MEMORY;

INSERT INTO t1 VALUES ('ABC',0), ('A',0), ('B',0), ('C',0);

UPDATE t1 SET c2= c2 + 1 WHERE c1 = 'A';

SELECT * FROM t1;

c1	c2

ABC	0

A	1

B	0

C	0

DROP TABLE t1;

CREATE TABLE t1 (

c1 ENUM('1', '2'),

UNIQUE USING BTREE(c1)

) ENGINE= MEMORY DEFAULT CHARSET= utf8;

INSERT INTO t1 VALUES('1'), ('2');

DROP TABLE t1;

CREATE TABLE t1 (

c1 SET('1', '2'),

UNIQUE USING BTREE(c1)

) ENGINE= MEMORY DEFAULT CHARSET= utf8;

INSERT INTO t1 VALUES('1'), ('2');

DROP TABLE t1;

End of 4.1 tests

CREATE TABLE t1(val INT, KEY USING BTREE(val)) ENGINE=memory;

INSERT INTO t1 VALUES(0);

mysql-test/r/myisam.result

+150 −0
Original line number Diff line number Diff line
@@ -943,6 +943,156 @@ SHOW TABLE STATUS LIKE 't1'; 
Name	Engine	Version	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Collation	Checksum	Create_options	Comment

t1	MyISAM	10	Dynamic	X	X	X	72057594037927935	X	X	X	X	X	X	latin1_swedish_ci	X	max_rows=4100100100 avg_row_length=70100	

DROP TABLE t1;

CREATE TABLE t1 (c1 TEXT NOT NULL, KEY c1 (c1(10))) ENGINE=MyISAM;

INSERT INTO t1 VALUES

(CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

(CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

(CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

(CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

(CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

(CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

(CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

(CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

(CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

(CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

(CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

(CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

(CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

(CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

(CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

(CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

(CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

(CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

(CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

(CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

(CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

(CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

(CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

(CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

(CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

(CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

(CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

(CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

(CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

(CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

(CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

(CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

(CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

(CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

(CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

(CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

(CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

(CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

(CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

(CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

(CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

(CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

(CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

(CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

(CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

(CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

(CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

(CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

(CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

(CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

(CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

(CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

(CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

(CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

(CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

(CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

(CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

(CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

(CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

(CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

(CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

(CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

(CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

(CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

(CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

(CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

(CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

(CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

(CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

(CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

(CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

(CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

(CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

(CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

(CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

(CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

(CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

(CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

(CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

(CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

(CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

(CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

(CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

(CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

(CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

(CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

(CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

(CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

(CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

(CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

(CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

(CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

(CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

(CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

(CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

(CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

(CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

(CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

(CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

(CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

(CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

(CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

(CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

(CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

(CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

(CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

(CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

(CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

(CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

(CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

(CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

(CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

(CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

(CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

(CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

(CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

(CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

(CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

(CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

(CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

(CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

(CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

(CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

(CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

(CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

(CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

(CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

(CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

(''), (''), (''), (''),

(' B'), (' B'), (' B'), (' B');

SELECT DISTINCT COUNT(*) FROM t1 WHERE c1 = '';

COUNT(*)

4

SELECT DISTINCT length(c1), c1 FROM t1 WHERE c1 = '';

length(c1)	c1

0	

SELECT DISTINCT COUNT(*) FROM t1 IGNORE INDEX (c1) WHERE c1 = '';

COUNT(*)

4

SELECT DISTINCT length(c1), c1 FROM t1 IGNORE INDEX (c1) WHERE c1 = '';

length(c1)	c1

0	

SELECT DISTINCT length(c1), c1 FROM t1 ORDER BY c1;

length(c1)	c1

0	

2		A

2	 B

DROP TABLE t1;

End of 4.1 tests

set storage_engine=MyISAM;

drop table if exists t1,t2,t3;