diff options
| author | monty@mysql.com <> | 2004-12-06 19:18:35 +0200 |
|---|---|---|
| committer | monty@mysql.com <> | 2004-12-06 19:18:35 +0200 |
| commit | 77207d19f20f21c54b8d5279c6924f4c4bdaaa51 (patch) | |
| tree | 44698f6f68c51daacf7552356ae071b8e8fdb035 /heap/hp_write.c | |
| parent | e99d5fee828e40589d7a29b81bba32b53e94037a (diff) | |
| parent | 67ce24796584e80cf843b37b09aeb794c9231190 (diff) | |
| download | mariadb-git-77207d19f20f21c54b8d5279c6924f4c4bdaaa51.tar.gz | |
Merge with new VARCHAR code
Diffstat (limited to 'heap/hp_write.c')
| -rw-r--r-- | heap/hp_write.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/heap/hp_write.c b/heap/hp_write.c index 43cee67b39c..577c52a007d 100644 --- a/heap/hp_write.c +++ b/heap/hp_write.c @@ -105,7 +105,7 @@ int hp_rb_write_key(HP_INFO *info, HP_KEYDEF *keyinfo, const byte *record, custom_arg.key_length= hp_rb_make_key(keyinfo, info->recbuf, record, recpos); if (keyinfo->flag & HA_NOSAME) { - custom_arg.search_flag= SEARCH_FIND | SEARCH_SAME; + custom_arg.search_flag= SEARCH_FIND | SEARCH_SAME | SEARCH_UPDATE; keyinfo->rb_tree.flag= TREE_NO_DUPS; } else @@ -369,7 +369,7 @@ int hp_write_key(HP_INFO *info, HP_KEYDEF *keyinfo, pos=empty; do { - if (! hp_rec_key_cmp(keyinfo, record, pos->ptr_to_rec)) + if (! hp_rec_key_cmp(keyinfo, record, pos->ptr_to_rec, 1)) { DBUG_RETURN(my_errno=HA_ERR_FOUND_DUPP_KEY); } |