Reset pCur->eSkip on a MoveTo (CVS 922)

FossilOrigin-Name: d983accf4a702158f03742fb11959d0fd035a4b4

diff --git a/manifest b/manifest
index d4199d616b8fccfaaec3f19777f78ba3955565d0..44564de69b3bea61dd4f1f8b2d00ad5d61877f03 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Update\scomments.\s\sRemove\sunused\sfield\sfrom\sthe\sIndex\sstructure.\s(CVS\s921)
-D 2003-04-20T00:00:24
+C Reset\spCur->eSkip\son\sa\sMoveTo\s(CVS\s922)
+D 2003-04-20T11:41:04
 F Makefile.in df3a4db41a7450468b5fe934d9dd8f723b631249
 F Makefile.linux-gcc b86a99c493a5bfb402d1d9178dcdc4bd4b32f906
 F README f1de682fbbd94899d50aca13d387d1b3fd3be2dd
@@ -23,7 +23,7 @@ F src/attach.c 7ebc7487de43e357a64226f8abef81f2669f2183
 F src/auth.c 2dd558dba4d8ffbed25fe1644e9af242f389f3e9
 F src/btree.c b9487cceb9ea78af9cbae9def34114902f511736
 F src/btree.h 529c98cb0715c62214544fbbe50b946f99a85540
-F src/btree_rb.c b14803c84dc1c8fb51f5db1542237b7b7d411957
+F src/btree_rb.c 0c4a10b52ae565071635863cc28c5b69fa5517fc
 F src/build.c 66f8ca2457dfdcc6c45e1606696f337418a8c556
 F src/copy.c 8699e571994934c78f70761a1458d7b9e9e75073
 F src/delete.c af65b26d9d13abbf63fdc4e97b88d26c700b04bb
@@ -162,7 +162,7 @@ F www/speed.tcl cb4c10a722614aea76d2c51f32ee43400d5951be
 F www/sqlite.tcl ae3dcfb077e53833b59d4fcc94d8a12c50a44098
 F www/tclsqlite.tcl 1db15abeb446aad0caf0b95b8b9579720e4ea331
 F www/vdbe.tcl 2013852c27a02a091d39a766bc87cff329f21218
-P 767f1af236d115e8388e1dcc28a4df1be48d6c85
-R 36dfa6d5306b8b01a3a590f7c2277b76
-U drh
-Z 7a756c9352dc04a8dce7c22eae170166
+P 7084e05093e72f6e5b65ff0b574336898396826f
+R c8c3aa1616b589f8a100a47f5c0c5e8a
+U paul
+Z cdfdd9c553e34df80f45529e35a33325

diff --git a/manifest.uuid b/manifest.uuid
index b1266713e778e229384f8dcf2cb687e40231eae7..d9262bf96840e259c8a2ba87b2da2d25a8e85b27 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-7084e05093e72f6e5b65ff0b574336898396826f
\ No newline at end of file
+d983accf4a702158f03742fb11959d0fd035a4b4
\ No newline at end of file

diff --git a/src/btree_rb.c b/src/btree_rb.c
index 5804288dee9bd2b6f5014bd941d7e072da8ad4d3..93db50dd94363f58378f08c118d7540d8ceced35 100644 (file)
--- a/src/btree_rb.c
+++ b/src/btree_rb.c
@@ -9,7 +9,7 @@
 **    May you share freely, never taking more than you give.
 **
 *************************************************************************
-** $Id: btree_rb.c,v 1.4 2003/04/18 22:52:39 drh Exp $
+** $Id: btree_rb.c,v 1.5 2003/04/20 11:41:04 paul Exp $
 **
 ** This file implements an in-core database using Red-Black balanced
 ** binary trees.
@@ -811,6 +811,7 @@ static int memBtreeMoveto(BtCursor* pCur, const void *pKey, int nKey, int *pRes)
    * between pTmp and the searched for key is already stored in *pRes. pTmp is
    * either the successor or predecessor of the key we tried to move to. */
   if( !pCur->pNode ) pCur->pNode = pTmp;
+  pCur->eSkip = SKIP_NONE;
 
   return SQLITE_OK;
 }
@@ -1007,6 +1008,12 @@ static int memBtreeLast(BtCursor* pCur, int *pRes)
   return SQLITE_OK;
 }
 
+/*
+** Advance the cursor to the next entry in the database.  If
+** successful then set *pRes=0.  If the cursor
+** was already pointing to the last entry in the database before
+** this routine was called, then set *pRes=1.
+*/
 static int memBtreeNext(BtCursor* pCur, int *pRes)
 {
   if( pCur->pNode && pCur->eSkip != SKIP_NEXT ){