database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Revert Bar's fix as this causes changes in the key tree that could cause incompatibilites

Browse Source 
Fix instead wrong call to ha_key_cmp
This is related to bug #10741 Inserting double value into utf8 column crashes server


myisam/mi_key.c:
  Revert Bar's fix as this causes changes in the key tree that could cause incompatibilites
myisam/mi_rnext_same.c:
  Fixed wrong arguments to ha_key_cmp()
  This caused a compare to fail if we first found a key with end space and then same key without end space
mysql-test/r/ctype_utf8.result:
  Additional test
mysql-test/t/ctype_utf8.test:
  Additional test
This commit is contained in:
unknown
2005-06-07 15:09:49 +03:00
parent 9f1610638b
commit 3dba83b95a
4 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
myisam/mi_key.c
View File

@ -84,8 +84,7 @@ uint _mi_make_key(register MI_INFO *info, uint keynr, uchar *key,
pos= (byte*) record+keyseg->start; pos= (byte*) record+keyseg->start;
if (keyseg->flag & HA_SPACE_PACK) if (keyseg->flag & HA_SPACE_PACK)
{ {
FIX_LENGTH(cs, pos, length, char_length); end= pos + length;
end= pos + char_length;
if (type != HA_KEYTYPE_NUM) if (type != HA_KEYTYPE_NUM)
{ {
while (end > pos && end[-1] == ' ') while (end > pos && end[-1] == ' ')
@ -96,7 +95,8 @@ uint _mi_make_key(register MI_INFO *info, uint keynr, uchar *key,
while (pos < end && pos[0] == ' ') while (pos < end && pos[0] == ' ')
pos++; pos++;
} }
char_length= (uint) (end - pos); length=(uint) (end-pos);
FIX_LENGTH(cs, pos, length, char_length);
store_key_length_inc(key,char_length); store_key_length_inc(key,char_length);
memcpy((byte*) key,(byte*) pos,(size_t) char_length); memcpy((byte*) key,(byte*) pos,(size_t) char_length);
key+=char_length; key+=char_length;

4
myisam/mi_rnext_same.c
View File

@ -68,8 +68,8 @@ int mi_rnext_same(MI_INFO *info, byte *buf)
info->lastkey_length,SEARCH_BIGGER, info->lastkey_length,SEARCH_BIGGER,
info->s->state.key_root[inx]))) info->s->state.key_root[inx])))
break; 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)) info->last_rkey_length, SEARCH_FIND, &not_used))
{ {
error=1; error=1;
my_errno=HA_ERR_END_OF_FILE; my_errno=HA_ERR_END_OF_FILE;

3
mysql-test/r/ctype_utf8.result
View File

@ -901,4 +901,7 @@ insert into t1 values (2,'Durban');
select * from t1 where city = 'Durban'; select * from t1 where city = 'Durban';
id city id city
2 Durban 2 Durban
select * from t1 where city = 'Durban ';
id city
2 Durban
drop table t1; drop table t1;

1
mysql-test/t/ctype_utf8.test
View File

@ -744,4 +744,5 @@ create table t1 (
insert into t1 values (1,'Durban North'); insert into t1 values (1,'Durban North');
insert into t1 values (2,'Durban'); insert into t1 values (2,'Durban');
select * from t1 where city = 'Durban'; select * from t1 where city = 'Durban';
select * from t1 where city = 'Durban ';
drop table t1; drop table t1;