Commit ef8115d6 authored by unknown's avatar unknown
Browse files

Merge rurik.mysql.com:/home/igor/dev/mysql-4.1-0 

into rurik.mysql.com:/home/igor/dev/mysql-5.0-0


myisam/mi_key.c:
  Auto merged
myisam/mi_rnext_same.c:
  Auto merged
mysql-test/r/ctype_utf8.result:
  Auto merged
parents 37e3dc83 beb288f4

myisam/mi_key.c

+3 −3
Original line number Diff line number Diff line
@@ -107,8 +107,7 @@ uint _mi_make_key(register MI_INFO *info, uint keynr, uchar *key, 
    }

    if (keyseg->flag & HA_SPACE_PACK)

    {

      FIX_LENGTH(cs, pos, length, char_length);

      end= pos + char_length;

      end= pos + length;

      if (type != HA_KEYTYPE_NUM)

      {

	while (end > pos && end[-1] == ' ')
@@ -119,7 +118,8 @@ uint _mi_make_key(register MI_INFO *info, uint keynr, uchar *key, 
	while (pos < end && pos[0] == ' ')

	  pos++;

      }

      char_length= (uint) (end - 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);

      key+=char_length;

myisam/mi_rnext_same.c

+2 −2
Original line number Diff line number Diff line
@@ -68,7 +68,7 @@ int mi_rnext_same(MI_INFO *info, byte *buf) 
			       info->lastkey_length,SEARCH_BIGGER,

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

          break;

        if (ha_key_cmp(keyinfo->seg,info->lastkey2,info->lastkey,

        if (ha_key_cmp(keyinfo->seg, info->lastkey, info->lastkey2,

                       info->last_rkey_length, SEARCH_FIND, &not_used))

        {

          error=1;

mysql-test/r/ctype_utf8.result

+3 −0
Original line number Diff line number Diff line
@@ -901,4 +901,7 @@ insert into t1 values (2,'Durban'); 
select * from t1 where city = 'Durban';

id	city

2	Durban

select * from t1 where city = 'Durban ';

id	city

2	Durban

drop table t1;

mysql-test/t/ctype_utf8.test

+1 −0
Original line number Diff line number Diff line
@@ -744,4 +744,5 @@ create table t1 ( 
insert into t1 values (1,'Durban North');

insert into t1 values (2,'Durban');

select * from t1 where city = 'Durban';

select * from t1 where city = 'Durban ';

drop table t1;