Commit 5177adcc authored by unknown's avatar unknown
Browse files

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

into gw.mysql.r18.ru:/usr/home/ram/work/5.0.bit.new


sql/field.h:
  Auto merged
sql/handler.h:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/table.cc:
  Auto merged
parents 31c7faac d7285006

include/m_ctype.h

+1 −1
Original line number Diff line number Diff line
@@ -85,7 +85,7 @@ enum my_lex_states 
{

  MY_LEX_START, MY_LEX_CHAR, MY_LEX_IDENT, 

  MY_LEX_IDENT_SEP, MY_LEX_IDENT_START,

  MY_LEX_REAL, MY_LEX_HEX_NUMBER,

  MY_LEX_REAL, MY_LEX_HEX_NUMBER, MY_LEX_BIN_NUMBER,

  MY_LEX_CMP_OP, MY_LEX_LONG_CMP_OP, MY_LEX_STRING, MY_LEX_COMMENT, MY_LEX_END,

  MY_LEX_OPERATOR_OR_IDENT, MY_LEX_NUMBER_IDENT, MY_LEX_INT_OR_REAL,

  MY_LEX_REAL_OR_POINT, MY_LEX_BOOL, MY_LEX_EOL, MY_LEX_ESCAPE,

include/my_base.h

+2 −1
Original line number Diff line number Diff line
@@ -182,7 +182,8 @@ enum ha_base_keytype { 
  HA_KEYTYPE_UINT24=13,

  HA_KEYTYPE_INT8=14,

  HA_KEYTYPE_VARTEXT=15,		/* Key is sorted as letters */

  HA_KEYTYPE_VARBINARY=16		/* Key is sorted as unsigned chars */

  HA_KEYTYPE_VARBINARY=16,		/* Key is sorted as unsigned chars */

  HA_KEYTYPE_BIT=17

};



#define HA_MAX_KEYTYPE	31		/* Must be log2-1 */

include/my_handler.h

+17 −0
Original line number Diff line number Diff line
@@ -34,6 +34,8 @@ typedef struct st_HA_KEYSEG /* Key-portion */ 
  uint32 start;				/* Start of key in record */

  uint32 null_pos;			/* position to NULL indicator */

  CHARSET_INFO *charset;

  uint8 bit_length;                     /* Length of bit part */

  uint16 bit_pos;                       /* Position to bit part */

} HA_KEYSEG;



#define get_key_length(length,key) \
@@ -64,6 +66,21 @@ typedef struct st_HA_KEYSEG /* Key-portion */ 
  { *(key)=255; mi_int2store((key)+1,(length)); (key)+=3; } \

}



#define get_rec_bits(bit_ptr, bit_ofs, bit_len) \

  (((((uint16) (bit_ptr)[1] << 8) | (uint16) (bit_ptr)[0]) >> (bit_ofs)) & \

   ((1 << (bit_len)) - 1))



#define set_rec_bits(bits, bit_ptr, bit_ofs, bit_len) \

{ \

  (bit_ptr)[0]= ((bit_ptr)[0] & ((1 << (bit_ofs)) - 1)) | \

                ((bits) << (bit_ofs)); \

  if ((bit_ofs) + (bit_len) > 8) \

    (bit_ptr)[1]= ((bits) & ((1 << (bit_len)) - 1)) >> (8 - (bit_ofs)); \

}



#define clr_rec_bits(bit_ptr, bit_ofs, bit_len) \

  set_rec_bits(0, bit_ptr, bit_ofs, bit_len)



extern int mi_compare_text(CHARSET_INFO *, uchar *, uint, uchar *, uint ,

			   my_bool, my_bool);

extern int ha_key_cmp(register HA_KEYSEG *keyseg, register uchar *a,

include/mysql_com.h

+2 −0
Original line number Diff line number Diff line
@@ -210,6 +210,7 @@ enum enum_field_types { MYSQL_TYPE_DECIMAL, MYSQL_TYPE_TINY, 
			MYSQL_TYPE_DATE,   MYSQL_TYPE_TIME,

			MYSQL_TYPE_DATETIME, MYSQL_TYPE_YEAR,

			MYSQL_TYPE_NEWDATE, MYSQL_TYPE_VARCHAR,

			MYSQL_TYPE_BIT,

			MYSQL_TYPE_ENUM=247,

			MYSQL_TYPE_SET=248,

			MYSQL_TYPE_TINY_BLOB=249,
@@ -250,6 +251,7 @@ enum enum_field_types { MYSQL_TYPE_DECIMAL, MYSQL_TYPE_TINY, 
#define FIELD_TYPE_CHAR        MYSQL_TYPE_TINY

#define FIELD_TYPE_INTERVAL    MYSQL_TYPE_ENUM

#define FIELD_TYPE_GEOMETRY    MYSQL_TYPE_GEOMETRY

#define FIELD_TYPE_BIT         MYSQL_TYPE_BIT





/* Shutdown/kill enums and constants */

myisam/mi_key.c

+33 −0
Original line number Diff line number Diff line
@@ -82,6 +82,19 @@ uint _mi_make_key(register MI_INFO *info, uint keynr, uchar *key, 
                  length);



    pos= (byte*) record+keyseg->start;

    if (type == HA_KEYTYPE_BIT)

    {

      if (keyseg->bit_length)

      {

        uchar bits= get_rec_bits((uchar*) record + keyseg->bit_pos,

                                 keyseg->bit_start, keyseg->bit_length);

        *key++= bits;

        length--;

      }

      memcpy((byte*) key, pos, length);

      key+= length;

      continue;

    }

    if (keyseg->flag & HA_SPACE_PACK)

    {

      end=pos+length;
@@ -333,6 +346,26 @@ static int _mi_put_key_in_record(register MI_INFO *info, uint keynr, 
      }

      record[keyseg->null_pos]&= ~keyseg->null_bit;

    }

    if (keyseg->type == HA_KEYTYPE_BIT)

    {

      uint length= keyseg->length;



      if (keyseg->bit_length)

      {

        uchar bits= *key++;

        set_rec_bits(bits, record + keyseg->bit_pos, keyseg->bit_start,

                     keyseg->bit_length);

        length--;

      }

      else

      {

        clr_rec_bits(record + keyseg->bit_pos, keyseg->bit_start,

                     keyseg->bit_length);

      }

      memcpy(record + keyseg->start, (byte*) key, length);

      key+= length;

      continue;

    }

    if (keyseg->flag & HA_SPACE_PACK)

    {

      uint length;