diff options
| author | ram@gw.udmsearch.izhnet.ru <> | 2002-05-21 21:54:08 +0500 |
|---|---|---|
| committer | ram@gw.udmsearch.izhnet.ru <> | 2002-05-21 21:54:08 +0500 |
| commit | 3b43cb2960b2f44b78d63fe94b249ff52da9d3c4 (patch) | |
| tree | 33c8cdcfd2d233bc3b663c05fd4bd9ca99b2bb5e /heap/hp_write.c | |
| parent | ba963bb64dbb51e6070fd34a17fc52335063cf4a (diff) | |
| download | mariadb-git-3b43cb2960b2f44b78d63fe94b249ff52da9d3c4.tar.gz | |
BTREE heap key structure is now the same as MyISAM
_mi_compare_text -> mi_compate_text
Changes according Monty's suggestions
Diffstat (limited to 'heap/hp_write.c')
| -rw-r--r-- | heap/hp_write.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/heap/hp_write.c b/heap/hp_write.c index 801505216bd..fcfe922d9c0 100644 --- a/heap/hp_write.c +++ b/heap/hp_write.c @@ -93,25 +93,25 @@ int hp_rb_write_key(HP_INFO *info, HP_KEYDEF *keyinfo, const byte *record, { heap_rb_param custom_arg; - info->last_pos = NULL; /* For heap_rnext/heap_rprev */ - hp_rb_make_key(keyinfo, info->recbuf, record, recpos); - custom_arg.keyseg = keyinfo->seg; - custom_arg.key_length = keyinfo->length; + info->last_pos= NULL; /* For heap_rnext/heap_rprev */ + custom_arg.keyseg= keyinfo->seg; + custom_arg.key_length= hp_rb_make_key(keyinfo, info->recbuf, record, recpos); if ((keyinfo->flag & HA_NOSAME) && (!(keyinfo->flag & HA_NULL_PART_KEY) || !hp_if_null_in_key(keyinfo, record))) { - custom_arg.search_flag = SEARCH_FIND | SEARCH_SAME; + custom_arg.search_flag= SEARCH_FIND | SEARCH_SAME; if (tree_search_key(&keyinfo->rb_tree, info->recbuf, info->parents, &info->last_pos, 0, &custom_arg)) { - my_errno = HA_ERR_FOUND_DUPP_KEY; + my_errno= HA_ERR_FOUND_DUPP_KEY; return 1; } } - custom_arg.search_flag = SEARCH_SAME; - return tree_insert(&keyinfo->rb_tree, (void*)info->recbuf, keyinfo->length + - sizeof(byte*), &custom_arg) ? 0 : 1; + custom_arg.search_flag= SEARCH_SAME; + return tree_insert(&keyinfo->rb_tree, (void*)info->recbuf, + custom_arg.key_length + sizeof(byte*), + &custom_arg) ? 0 : 1; } /* Find where to place new record */ |