diff options
author | unknown <serg@serg.mysql.com> | 2002-10-14 11:36:48 +0000 |
---|---|---|
committer | unknown <serg@serg.mysql.com> | 2002-10-14 11:36:48 +0000 |
commit | 425e06ea6d2ff721fc03c22a6eb54dcc6ce5a9c7 (patch) | |
tree | 50e53348aa9b2bb4539eb9061d6dbaf5b3bb646f /heap/hp_rsame.c | |
parent | 32d981c3b2127fa75f6f3ef045d6ecffb472d31a (diff) | |
parent | 541a1c3362d92d67f704e5e1913f90c48ab6642c (diff) | |
download | mariadb-git-425e06ea6d2ff721fc03c22a6eb54dcc6ce5a9c7.tar.gz |
merged
BitKeeper/etc/logging_ok:
auto-union
configure.in:
Auto merged
libmysqld/Makefile.am:
Auto merged
myisam/Makefile.am:
Auto merged
myisam/mi_check.c:
Auto merged
myisam/myisampack.c:
Auto merged
mysql-test/r/fulltext.result:
Auto merged
mysys/Makefile.am:
Auto merged
sql/Makefile.am:
Auto merged
sql/sql_delete.cc:
Auto merged
sql/sql_update.cc:
Auto merged
strings/Makefile.am:
Auto merged
Diffstat (limited to 'heap/hp_rsame.c')
-rw-r--r-- | heap/hp_rsame.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/heap/hp_rsame.c b/heap/hp_rsame.c index a346707641b..6a375753b1a 100644 --- a/heap/hp_rsame.c +++ b/heap/hp_rsame.c @@ -41,8 +41,8 @@ int heap_rsame(register HP_INFO *info, byte *record, int inx) else if (inx != -1) { info->lastinx=inx; - _hp_make_key(share->keydef+inx,info->lastkey,record); - if (!_hp_search(info,share->keydef+inx,info->lastkey,3)) + hp_make_key(share->keydef + inx, info->lastkey, record); + if (!hp_search(info, share->keydef + inx, info->lastkey, 3)) { info->update=0; DBUG_RETURN(my_errno); |