projects
/
idzebra-moved-to-github.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
adc0ef5
)
Change to is_merge
author
Sebastian Hammer
<quinn@indexdata.com>
Fri, 29 Mar 1996 14:11:47 +0000
(14:11 +0000)
committer
Sebastian Hammer
<quinn@indexdata.com>
Fri, 29 Mar 1996 14:11:47 +0000
(14:11 +0000)
isam/isam.c
patch
|
blob
|
history
diff --git
a/isam/isam.c
b/isam/isam.c
index
da49155
..
91ad2cb
100644
(file)
--- a/
isam/isam.c
+++ b/
isam/isam.c
@@
-4,7
+4,10
@@
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: isam.c,v $
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: isam.c,v $
- * Revision 1.20 1996-03-19 13:14:57 quinn
+ * Revision 1.21 1996-03-29 14:11:47 quinn
+ * Change to is_merge
+ *
+ * Revision 1.20 1996/03/19 13:14:57 quinn
* Moved an xfree()
*
* Revision 1.19 1996/02/10 12:20:56 quinn
* Moved an xfree()
*
* Revision 1.19 1996/02/10 12:20:56 quinn
@@
-476,9
+479,8
@@
ISAM_P is_merge(ISAM is, ISAM_P pos, int num, char *data)
continue;
}
/* else check if next key can fit in this position */
continue;
}
/* else check if next key can fit in this position */
- is_m_peek_record(&tab, keybuf);
- res = (*is->cmp)(data + 1, keybuf);
- if (res < 0)
+ if (is_m_peek_record(&tab, keybuf) &&
+ (*is->cmp)(data + 1, keybuf) < 0)
{
logf (LOG_DEBUG, "XXReplacing record.");
is_m_replace_record(&tab, data + 1);
{
logf (LOG_DEBUG, "XXReplacing record.");
is_m_replace_record(&tab, data + 1);