Commit 717fc0b0 authored by unknown's avatar unknown
Browse files

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

into mysql.com:/home/my/mysql-4.1


libmysql/libmysql.c:
  Auto merged
mysql-test/r/endspace.result:
  Auto merged
strings/ctype-bin.c:
  Auto merged
strings/ctype-mb.c:
  Auto merged
parents c75e4dfe 44b2807e

heap/hp_hash.c

+37 −30
Original line number Diff line number Diff line
@@ -246,12 +246,12 @@ ulong hp_hashnr(register HP_KEYDEF *keydef, register const byte *key) 
    if (seg->type == HA_KEYTYPE_TEXT)

    {

       CHARSET_INFO *cs= seg->charset;

       uint length= ((uchar*)key) - pos;

       uint char_length= length / cs->mbmaxlen;

       if (length > char_length)

       uint char_length= (uint) ((uchar*) key - pos);

       if (cs->mbmaxlen > 1)

       {

         char_length= my_charpos(cs, pos, pos + length, char_length);

         set_if_smaller(char_length, length);

         uint length= char_length;

         char_length= my_charpos(cs, pos, pos + length, length/cs->mbmaxlen);

         set_if_smaller(char_length, length);   /* QQ: ok to remove? */

       }

       cs->coll->hash_sort(cs, pos, char_length, &nr, &nr2);

    }
@@ -289,11 +289,12 @@ ulong hp_rec_hashnr(register HP_KEYDEF *keydef, register const byte *rec) 
    if (seg->type == HA_KEYTYPE_TEXT)

    {

      CHARSET_INFO *cs= seg->charset;

      uint char_length= seg->length / cs->mbmaxlen;

      if (seg->length > char_length)

      uint char_length= seg->length;

      if (cs->mbmaxlen > 1)

      {

        char_length= my_charpos(cs, pos, pos + seg->length, char_length);

        set_if_smaller(char_length, seg->length);

        char_length= my_charpos(cs, pos, pos + char_length,

                                char_length / cs->mbmaxlen);

        set_if_smaller(char_length, seg->length); /* QQ: ok to remove? */

      }

      cs->coll->hash_sort(cs, pos, char_length, &nr, &nr2);

    }
@@ -417,17 +418,17 @@ int hp_rec_key_cmp(HP_KEYDEF *keydef, const byte *rec1, const byte *rec2) 
    if (seg->type == HA_KEYTYPE_TEXT)

    {

      CHARSET_INFO *cs= seg->charset;

      uint char_length= seg->length / cs->mbmaxlen;

      uint char_length1;

      uint char_length2;

      uchar *pos1= (uchar*)rec1 + seg->start;

      uchar *pos2= (uchar*)rec2 + seg->start;

      if (seg->length > char_length)

      if (cs->mbmaxlen > 1)

      {

        uint char_length= seg->length / cs->mbmaxlen;

        char_length1= my_charpos(cs, pos1, pos1 + seg->length, char_length);

        set_if_smaller(char_length1, seg->length);

        set_if_smaller(char_length1, seg->length); /* QQ: ok to remove? */

        char_length2= my_charpos(cs, pos2, pos2 + seg->length, char_length);

        set_if_smaller(char_length2, seg->length);

        set_if_smaller(char_length2, seg->length); /* QQ: ok to remove? */

      }

      else

      {
@@ -468,12 +469,12 @@ int hp_key_cmp(HP_KEYDEF *keydef, const byte *rec, const byte *key) 
    if (seg->type == HA_KEYTYPE_TEXT)

    {

      CHARSET_INFO *cs= seg->charset;

      uint char_length= seg->length / cs->mbmaxlen;

      uint char_length_key;

      uint char_length_rec;

      uchar *pos= (uchar*) rec + seg->start;

      if (seg->length > char_length)

      if (cs->mbmaxlen > 1)

      {

        uint char_length= seg->length / cs->mbmaxlen;

        char_length_key= my_charpos(cs, key, key + seg->length, char_length);

        set_if_smaller(char_length_key, seg->length);

        char_length_rec= my_charpos(cs, pos, pos + seg->length, char_length);
@@ -509,21 +510,22 @@ void hp_make_key(HP_KEYDEF *keydef, byte *key, const byte *rec) 
  for (seg=keydef->seg,endseg=seg+keydef->keysegs ; seg < endseg ; seg++)

  {

    CHARSET_INFO *cs= seg->charset;

    uint char_length= (cs && cs->mbmaxlen > 1) ? seg->length / cs->mbmaxlen :

                                                 seg->length;

    uint char_length= seg->length;

    uchar *pos= (uchar*) rec + seg->start;

    if (seg->null_bit)

      *key++= test(rec[seg->null_pos] & seg->null_bit);

    if (seg->length > char_length)

    if (cs->mbmaxlen > 1)

    {

      char_length= my_charpos(cs, pos, pos + seg->length, char_length);

      set_if_smaller(char_length, seg->length);

      char_length= my_charpos(cs, pos, pos + seg->length,

                              char_length / cs->mbmaxlen);

      set_if_smaller(char_length, seg->length); /* QQ: ok to remove? */

    }

    memcpy(key,rec+seg->start,(size_t) char_length);

    key+= char_length;

  }

}





uint hp_rb_make_key(HP_KEYDEF *keydef, byte *key, 

		    const byte *rec, byte *recpos)

{
@@ -575,13 +577,13 @@ uint hp_rb_make_key(HP_KEYDEF *keydef, byte *key, 
      }

      continue;

    }

    char_length= seg->length / (seg->charset ? seg->charset->mbmaxlen : 1);

    if (seg->length > char_length)

    char_length= seg->length;

    if (seg->charset->mbmaxlen > 1)

    {

      char_length= my_charpos(seg->charset, 

                              rec + seg->start, rec + seg->start + seg->length,

                              char_length);

      set_if_smaller(char_length, seg->length);

                              rec + seg->start, rec + seg->start + char_length,

                              char_length / seg->charset->mbmaxlen);

      set_if_smaller(char_length, seg->length); /* QQ: ok to remove? */

      if (char_length < seg->length)

        seg->charset->cset->fill(seg->charset, key + char_length, 

                                 seg->length - char_length, ' ');
@@ -593,7 +595,9 @@ uint hp_rb_make_key(HP_KEYDEF *keydef, byte *key, 
  return key - start_key;

}



uint hp_rb_pack_key(HP_KEYDEF *keydef, uchar *key, const uchar *old, uint k_len)



uint hp_rb_pack_key(HP_KEYDEF *keydef, uchar *key, const uchar *old,

                    uint k_len)

{

  HA_KEYSEG *seg, *endseg;

  uchar *start_key= key;
@@ -623,11 +627,12 @@ uint hp_rb_pack_key(HP_KEYDEF *keydef, uchar *key, const uchar *old, uint k_len) 
      }

      continue;

    }

    char_length= seg->length / (seg->charset ? seg->charset->mbmaxlen : 1);

    if (seg->length > char_length)

    char_length= seg->length;

    if (seg->charset->mbmaxlen > 1)

    {

      char_length= my_charpos(seg->charset, old, old+seg->length, char_length);

      set_if_smaller(char_length, seg->length);

      char_length= my_charpos(seg->charset, old, old+char_length,

                              char_length / seg->charset->mbmaxlen);

      set_if_smaller(char_length, seg->length); /* QQ: ok to remove? */

      if (char_length < seg->length)

        seg->charset->cset->fill(seg->charset, key + char_length, 

                                 seg->length - char_length, ' ');
@@ -639,12 +644,14 @@ uint hp_rb_pack_key(HP_KEYDEF *keydef, uchar *key, const uchar *old, uint k_len) 
  return key - start_key;

}





uint hp_rb_key_length(HP_KEYDEF *keydef, 

		      const byte *key __attribute__((unused)))

{

  return keydef->length;

}





uint hp_rb_null_key_length(HP_KEYDEF *keydef, const byte *key)

{

  const byte *start_key= key;

libmysql/libmysql.c

+2 −2
Original line number Diff line number Diff line
@@ -3429,7 +3429,7 @@ static void fetch_long_with_conversion(MYSQL_BIND *param, MYSQL_FIELD *field, 
    char buff[22];                              /* Enough for longlong */

    char *end= longlong10_to_str(value, buff, field_is_unsigned ? 10: -10);

    /* Resort to string conversion which supports all typecodes */

    fetch_string_with_conversion(param, buff, end - buff);

    fetch_string_with_conversion(param, buff, (uint) (end - buff));

    break;

  }

  }
@@ -3505,7 +3505,7 @@ static void fetch_float_with_conversion(MYSQL_BIND *param, MYSQL_FIELD *field, 
      sprintf(buff, "%.*f", (int) field->decimals, value);

      end= strend(buff);

    }

    fetch_string_with_conversion(param, buff, end - buff);

    fetch_string_with_conversion(param, buff, (uint) (end - buff));

    break;

  }

  }

myisam/mi_key.c

+12 −11
Original line number Diff line number Diff line
@@ -23,9 +23,9 @@ 
#include <ieeefp.h>

#endif



#define CHECK_KEYS

#define CHECK_KEYS                              /* Enable safety checks */



#define FIX_LENGTH                                                          \

#define FIX_LENGTH(cs, pos, length, char_length)                            \

            do {                                                            \

              if (length > char_length)                                     \

                char_length= my_charpos(cs, pos, pos+length, char_length);  \
@@ -78,7 +78,8 @@ uint _mi_make_key(register MI_INFO *info, uint keynr, uchar *key, 
      *key++=1;					/* Not NULL */

    }



    char_length= (!is_ft && cs && cs->mbmaxlen > 1) ? length/cs->mbmaxlen : length;

    char_length= ((!is_ft && cs && cs->mbmaxlen > 1) ? length/cs->mbmaxlen :

                  length);



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

    if (keyseg->flag & HA_SPACE_PACK)
@@ -95,7 +96,7 @@ uint _mi_make_key(register MI_INFO *info, uint keynr, uchar *key, 
	  pos++;

      }

      length=(uint) (end-pos);

      FIX_LENGTH;

      FIX_LENGTH(cs, pos, length, char_length);

      store_key_length_inc(key,char_length);

      memcpy((byte*) key,(byte*) pos,(size_t) char_length);

      key+=char_length;
@@ -106,7 +107,7 @@ uint _mi_make_key(register MI_INFO *info, uint keynr, uchar *key, 
      uint tmp_length=uint2korr(pos);

      pos+=2;					/* Skip VARCHAR length */

      set_if_smaller(length,tmp_length);

      FIX_LENGTH;

      FIX_LENGTH(cs, pos, length, char_length);

      store_key_length_inc(key,char_length);

      memcpy((byte*) key,(byte*) pos,(size_t) char_length);

      key+= char_length;
@@ -117,7 +118,7 @@ uint _mi_make_key(register MI_INFO *info, uint keynr, uchar *key, 
      uint tmp_length=_mi_calc_blob_length(keyseg->bit_start,pos);

      memcpy_fixed((byte*) &pos,pos+keyseg->bit_start,sizeof(char*));

      set_if_smaller(length,tmp_length);

      FIX_LENGTH;

      FIX_LENGTH(cs, pos, length, char_length);

      store_key_length_inc(key,char_length);

      memcpy((byte*) key,(byte*) pos,(size_t) char_length);

      key+= char_length;
@@ -157,7 +158,7 @@ uint _mi_make_key(register MI_INFO *info, uint keynr, uchar *key, 
      }

      continue;

    }

    FIX_LENGTH;

    FIX_LENGTH(cs, pos, length, char_length);

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

    if (length > char_length)

      cs->cset->fill(cs, key+char_length, length-char_length, ' ');
@@ -237,7 +238,7 @@ uint _mi_pack_key(register MI_INFO *info, uint keynr, uchar *key, uchar *old, 
      }

      k_length-=length;

      length=(uint) (end-pos);

      FIX_LENGTH;

      FIX_LENGTH(cs, pos, length, char_length);

      store_key_length_inc(key,char_length);

      memcpy((byte*) key,pos,(size_t) char_length);

      key+= char_length;
@@ -250,7 +251,7 @@ uint _mi_pack_key(register MI_INFO *info, uint keynr, uchar *key, uchar *old, 
      k_length-= 2+length;

      pos+=2;

      set_if_smaller(length,tmp_length);	/* Safety */

      FIX_LENGTH;

      FIX_LENGTH(cs, pos, length, char_length);

      store_key_length_inc(key,char_length);

      old+=2;					/* Skip length */

      memcpy((byte*) key, pos,(size_t) char_length);
@@ -267,7 +268,7 @@ uint _mi_pack_key(register MI_INFO *info, uint keynr, uchar *key, uchar *old, 
      }

      continue;

    }

    FIX_LENGTH;

    FIX_LENGTH(cs, pos, length, char_length);

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

    if (length > char_length)

      cs->cset->fill(cs,key+char_length, length-char_length, ' ');

mysql-test/r/connect.result

+1 −0
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ show tables; 
Tables_in_test

update mysql.user set password=old_password("gambling2") where user=_binary"test";

flush privileges;

set password="";

set password='gambling3';

ERROR HY000: Password hash should be a 41-digit hexadecimal number

set password=old_password('gambling3');

mysql-test/r/create_select_tmp.result

+4 −4
Original line number Diff line number Diff line 
drop table if exists t1, t2;

CREATE TABLE t1 ( a int );

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

CREATE TABLE t2 ( PRIMARY KEY (a) ) TYPE=INNODB SELECT a FROM t1;

CREATE TABLE t2 ( PRIMARY KEY (a) ) ENGINE=INNODB SELECT a FROM t1;

ERROR 23000: Duplicate entry '1' for key 1

select * from t2;

ERROR 42S02: Table 'test.t2' doesn't exist

CREATE TEMPORARY TABLE t2 ( PRIMARY KEY (a) ) TYPE=INNODB SELECT a FROM t1;

CREATE TEMPORARY TABLE t2 ( PRIMARY KEY (a) ) ENGINE=INNODB SELECT a FROM t1;

ERROR 23000: Duplicate entry '1' for key 1

select * from t2;

ERROR 42S02: Table 'test.t2' doesn't exist

CREATE TABLE t2 ( PRIMARY KEY (a) ) TYPE=MYISAM SELECT a FROM t1;

CREATE TABLE t2 ( PRIMARY KEY (a) ) ENGINE=MYISAM SELECT a FROM t1;

ERROR 23000: Duplicate entry '1' for key 1

select * from t2;

ERROR 42S02: Table 'test.t2' doesn't exist

CREATE TEMPORARY TABLE t2 ( PRIMARY KEY (a) ) TYPE=MYISAM SELECT a FROM t1;

CREATE TEMPORARY TABLE t2 ( PRIMARY KEY (a) ) ENGINE=MYISAM SELECT a FROM t1;

ERROR 23000: Duplicate entry '1' for key 1

select * from t2;

ERROR 42S02: Table 'test.t2' doesn't exist