projects
/
idzebra-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
a3
[idzebra-moved-to-github.git]
/
isam
/
memory.c
diff --git
a/isam/memory.c
b/isam/memory.c
index
cd90dcb
..
afb7887
100644
(file)
--- a/
isam/memory.c
+++ b/
isam/memory.c
@@
-4,7
+4,13
@@
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: memory.c,v $
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: memory.c,v $
- * Revision 1.7 1995-12-06 09:59:46 quinn
+ * Revision 1.9 1995-12-06 15:48:46 quinn
+ * Fixed update-problem.
+ *
+ * Revision 1.8 1995/12/06 14:48:27 quinn
+ * Fixed some strange bugs.
+ *
+ * Revision 1.7 1995/12/06 09:59:46 quinn
* Fixed memory-consumption bug in memory.c
* Added more blocksizes to the default ISAM configuration.
*
* Fixed memory-consumption bug in memory.c
* Added more blocksizes to the default ISAM configuration.
*
@@
-334,7
+340,7
@@
int is_m_peek_record(is_mtable *tab, void *rec)
return 1;
}
return 1;
}
-int is_m_read_record(is_mtable *tab, void *buf)
+int is_m_read_record(is_mtable *tab, void *buf, int keep)
{
is_mbuf *mbuf;
{
is_mbuf *mbuf;
@@
-347,7
+353,8
@@
int is_m_read_record(is_mtable *tab, void *buf)
{
if (!mbuf->next) /* end of mblock */
{
{
if (!mbuf->next) /* end of mblock */
{
- if (tab->cur_mblock->state == IS_MBSTATE_CLEAN)
+ if (!keep && tab->cur_mblock->state == IS_MBSTATE_CLEAN &&
+ tab->cur_mblock->diskpos > 0)
{
xfree_mbufs(tab->cur_mblock->data);
tab->cur_mblock->data = 0;
{
xfree_mbufs(tab->cur_mblock->data);
tab->cur_mblock->data = 0;
@@
-384,7
+391,7
@@
int is_m_seek_record(is_mtable *tab, const void *rec)
for (;;)
{
for (;;)
{
- if (is_m_read_record(tab, &peek) <= 0)
+ if (is_m_read_record(tab, &peek, 1) <= 0)
return 1;
if ((rs = (*tab->is->cmp)(peek, rec)) > 0)
{
return 1;
if ((rs = (*tab->is->cmp)(peek, rec)) > 0)
{