Commit c6de4d1c authored by unknown's avatar unknown
Browse files

Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0-rpl 

into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge


BitKeeper/etc/collapsed:
  auto-union
mysql-test/r/ctype_utf8.result:
  Auto merged
sql/field.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
parents 024a1781 fff7e919

BitKeeper/etc/collapsed

+2 −0
Original line number Diff line number Diff line
@@ -15,3 +15,5 @@ 
45214442pBGT9KuZEGixBH71jTzbOA

45214a07hVsIGwvwa-WrO-jpeaSwVw

452a92d0-31-8wSzSfZi165fcGcXPA

452c6c6dAjuNghfc1ObZ_UQ5SCl85g

4538a7b0EbDHHkWPbIwxO6ZIDdg6Dg

include/m_ctype.h

+6 −6
Original line number Diff line number Diff line
@@ -178,8 +178,8 @@ typedef struct my_charset_handler_st 
	       unsigned char *s,unsigned char *e);

  

  /* Functions for case and sort convertion */

  void    (*caseup_str)(struct charset_info_st *, char *);

  void    (*casedn_str)(struct charset_info_st *, char *);

  uint    (*caseup_str)(struct charset_info_st *, char *);

  uint    (*casedn_str)(struct charset_info_st *, char *);

  uint    (*caseup)(struct charset_info_st *, char *src, uint srclen,

                                              char *dst, uint dstlen);

  uint    (*casedn)(struct charset_info_st *, char *src, uint srclen,
@@ -311,8 +311,8 @@ extern uint my_instr_simple(struct charset_info_st *, 




/* Functions for 8bit */

extern void my_caseup_str_8bit(CHARSET_INFO *, char *);

extern void my_casedn_str_8bit(CHARSET_INFO *, char *);

extern uint my_caseup_str_8bit(CHARSET_INFO *, char *);

extern uint my_casedn_str_8bit(CHARSET_INFO *, char *);

extern uint my_caseup_8bit(CHARSET_INFO *, char *src, uint srclen,

                                           char *dst, uint dstlen);

extern uint my_casedn_8bit(CHARSET_INFO *, char *src, uint srclen,
@@ -399,8 +399,8 @@ int my_mbcharlen_8bit(CHARSET_INFO *, uint c); 




/* Functions for multibyte charsets */

extern void my_caseup_str_mb(CHARSET_INFO *, char *);

extern void my_casedn_str_mb(CHARSET_INFO *, char *);

extern uint my_caseup_str_mb(CHARSET_INFO *, char *);

extern uint my_casedn_str_mb(CHARSET_INFO *, char *);

extern uint my_caseup_mb(CHARSET_INFO *, char *src, uint srclen,

                                         char *dst, uint dstlen);

extern uint my_casedn_mb(CHARSET_INFO *, char *src, uint srclen,

myisam/mi_key.c

+8 −7
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ static int _mi_put_key_in_record(MI_INFO *info,uint keynr,byte *record); 
uint _mi_make_key(register MI_INFO *info, uint keynr, uchar *key,

		  const byte *record, my_off_t filepos)

{

  byte *pos,*end;

  byte *pos;

  uchar *start;

  reg1 HA_KEYSEG *keyseg;

  my_bool is_ft= info->s->keyinfo[keynr].flag & HA_FULLTEXT;
@@ -107,18 +107,17 @@ uint _mi_make_key(register MI_INFO *info, uint keynr, uchar *key, 
    }

    if (keyseg->flag & HA_SPACE_PACK)

    {

      end= pos + length;

      if (type != HA_KEYTYPE_NUM)

      {

	while (end > pos && end[-1] == ' ')

	  end--;

        length= cs->cset->lengthsp(cs, pos, length);

      }

      else

      {

        byte *end= pos + length;

	while (pos < end && pos[0] == ' ')

	  pos++;

      }

	length=(uint) (end-pos);

      }

      FIX_LENGTH(cs, pos, length, char_length);

      store_key_length_inc(key,char_length);

      memcpy((byte*) key,(byte*) pos,(size_t) char_length);
@@ -404,7 +403,9 @@ static int _mi_put_key_in_record(register MI_INFO *info, uint keynr, 
      if (keyseg->type != (int) HA_KEYTYPE_NUM)

      {

        memcpy(pos,key,(size_t) length);

	bfill(pos+length,keyseg->length-length,' ');

        keyseg->charset->cset->fill(keyseg->charset,

                                    pos + length, keyseg->length - length,

                                    ' ');

      }

      else

      {

myisam/mi_open.c

+2 −0
Original line number Diff line number Diff line
@@ -336,6 +336,8 @@ MI_INFO *mi_open(const char *name, int mode, uint open_flags) 
	      goto err;

	    }

	  }

	  else if (pos->type == HA_KEYTYPE_BINARY)

	    pos->charset= &my_charset_bin;

	}

	if (share->keyinfo[i].flag & HA_SPATIAL)

	{

mysql-test/include/strict_autoinc.inc

+4 −0
Original line number Diff line number Diff line
@@ -2,6 +2,10 @@ 
# Test for strict-mode autoincrement

#



--disable_warnings

drop table if exists t1;

--enable_warnings



set @org_mode=@@sql_mode;

eval create table t1

(