1
0
mirror of https://github.com/sqlite/sqlite.git synced 2025-08-07 02:42:48 +03:00

A cosmetic changes to btree.c which (we are told) works around a bug

in MSVC++. (CVS 4491)

FossilOrigin-Name: 329dd014b0d851f21ff6690b6149e9d73c92302d
This commit is contained in:
drh
2007-10-16 19:45:29 +00:00
parent d2bb3278e0
commit 51f015eb9c
3 changed files with 10 additions and 9 deletions

View File

@@ -1,5 +1,5 @@
C Add\sa\smalloc\ssize\shistogram\sto\sthe\sdebugging\smalloc\simplementation\nin\smem2.c.\s(CVS\s4490)
D 2007-10-15T19:34:32
C A\scosmetic\schanges\sto\sbtree.c\swhich\s(we\sare\stold)\sworks\saround\sa\sbug\nin\sMSVC++.\s(CVS\s4491)
D 2007-10-16T19:45:30
F Makefile.in 75b729d562e9525d57d9890ec598b38e1a8b02bc
F Makefile.linux-gcc 65241babba6faf1152bf86574477baab19190499
F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028
@@ -81,7 +81,7 @@ F src/analyze.c 49b4bd45eb286d833793ed6bf72355a5c1974865
F src/attach.c a01d55157d46a1234909f3a7f21fb09549c947bd
F src/auth.c c8b2ab5c8bad4bd90ed7c294694f48269162c627
F src/btmutex.c 442be6f068d77ca9ffd69899cf0a3943c244548c
F src/btree.c a491c45b4412e6f19458e122bafa0cca8f22d224
F src/btree.c 1212c51618a685e44313799daf39b3be6215cbb5
F src/btree.h d0736ebca4b6eafbdd823c46a8de574cea078211
F src/btreeInt.h 4330c19b8314545fdb209cc77e2a57f6a5290e9c
F src/build.c d4ace66c2612d8973a17afdfe34b2a62f1a80178
@@ -581,7 +581,7 @@ F www/tclsqlite.tcl 8be95ee6dba05eabcd27a9d91331c803f2ce2130
F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
F www/version3.tcl 890248cf7b70e60c383b0e84d77d5132b3ead42b
F www/whentouse.tcl fc46eae081251c3c181bd79c5faef8195d7991a5
P 260711a14d5ab2d7c9888c7c46c33a28a3da0415
R e7cd2dbd87cc55ed9709f416c29bb4b2
P 3e51696cb878063e4ebfdcc2a61ba94c9bebdfe3
R 2c5db09a596b5887fe31e5ce130e47d6
U drh
Z b3fd55271c42d6d384286f4a414e866e
Z b6e5c906f816cb3396ed4137d0100665

View File

@@ -1 +1 @@
3e51696cb878063e4ebfdcc2a61ba94c9bebdfe3
329dd014b0d851f21ff6690b6149e9d73c92302d

View File

@@ -9,7 +9,7 @@
** May you share freely, never taking more than you give.
**
*************************************************************************
** $Id: btree.c,v 1.428 2007/10/03 08:46:44 danielk1977 Exp $
** $Id: btree.c,v 1.429 2007/10/16 19:45:30 drh Exp $
**
** This file implements a external (disk-based) database using BTrees.
** See the header comment on "btreeInt.h" for additional information.
@@ -3039,7 +3039,7 @@ static int accessPayload(
u32 nKey;
int iIdx = 0;
MemPage *pPage = pCur->pPage; /* Btree page of current cursor entry */
BtShared *pBt = pCur->pBt; /* Btree this cursor belongs to */
BtShared *pBt; /* Btree this cursor belongs to */
assert( pPage );
assert( pCur->eState==CURSOR_VALID );
@@ -3073,6 +3073,7 @@ static int accessPayload(
offset -= pCur->info.nLocal;
}
pBt = pCur->pBt;
if( rc==SQLITE_OK && amt>0 ){
const int ovflSize = pBt->usableSize - 4; /* Bytes content per ovfl page */
Pgno nextPage;