Fix a bug in the sqlite3TripAllCursors() routine that prevents it from

reporting errors.  It is unknown at this time whether or not this omission can
result in any incorrect result in an actual query.

FossilOrigin-Name: 2896f2640ab3e102ee248d20fb68c497817524eb

diff --git a/manifest b/manifest
index 267f0a0da99291e474525feb53b75154810e7ee9..9cb41e8715520ea487646c35ef2c35c105f81ccf 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Update\sa\scouple\sof\stest\scases\sto\saccount\sfor\sthe\sfact\sthat\sROLLBACK\sdoes\snot\salways\sabort\sall\srunning\sSELECT\sstatements.
-D 2014-11-18T20:16:27.742
+C Fix\sa\sbug\sin\sthe\ssqlite3TripAllCursors()\sroutine\sthat\sprevents\sit\sfrom\nreporting\serrors.\s\sIt\sis\sunknown\sat\sthis\stime\swhether\sor\snot\sthis\somission\scan\nresult\sin\sany\sincorrect\sresult\sin\san\sactual\squery.
+D 2014-11-18T20:22:05.030
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in a226317fdf3f4c895fb3cfedc355b4d0868ce1fb
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -173,7 +173,7 @@ F src/auth.c b56c78ebe40a2110fd361379f7e8162d23f92240
 F src/backup.c 7ddee9c7d505e07e959a575b18498f17c71e53ea
 F src/bitvec.c 19a4ba637bd85f8f63fc8c9bae5ade9fb05ec1cb
 F src/btmutex.c 49ca66250c7dfa844a4d4cb8272b87420d27d3a5
-F src/btree.c d5d991b518fa5bebc64037dfeb98a48051d864d7
+F src/btree.c 75edb585cc2c66615e0ea01a48807a7bfae4f2fe
 F src/btree.h e31a3a3ebdedb1caf9bda3ad5dbab3db9b780f6e
 F src/btreeInt.h 026d0129724e8f265fdc60d44ec240cf5a4e6179
 F src/build.c 67bb05b1077e0cdaccb2e36bfcbe7a5df9ed31e8
@@ -1221,8 +1221,8 @@ F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh 0abfd78ceb09b7f7c27c688c8e3fe93268a13b32
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P 54e7d3fcb1ab21c03ffef1af93ae029a2901098a
-Q +eba171e980fa4491dfee9d7e4df50c87a0ebbf87
-R 07c45ea3d962860999af22ae8c2af8c8
+P abccda769a3f6b755c3bf70b5fb31a5e16718ef3
+Q +42588207ff5451cb785c394633e1ab631fb82f01
+R be8390e45e84a659cdb889947026b04a
 U drh
-Z f4bad3f3683413628206e5a23517cfd8
+Z 45d41fa50f6cb7c97c28d0b284fe4014

diff --git a/manifest.uuid b/manifest.uuid
index 22da5e0ebaa7986504624878cb8ee6b6c40d2ead..922bec9a781b0e6dcd60aaa070900fc2345ed915 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-abccda769a3f6b755c3bf70b5fb31a5e16718ef3
\ No newline at end of file
+2896f2640ab3e102ee248d20fb68c497817524eb
\ No newline at end of file

diff --git a/src/btree.c b/src/btree.c
index f153a0cc45d58a30cb9f03a4ffb9fd907cb4e6ba..7a49fb1a793f5b4e3e38562ba1c944c6666baf42 100644 (file)
--- a/src/btree.c
+++ b/src/btree.c
@@ -3541,7 +3541,7 @@ int sqlite3BtreeTripAllCursors(Btree *pBtree, int errCode, int writeOnly){
       int i;
       if( writeOnly && (p->curFlags & BTCF_WriteFlag)==0 ){
         if( p->eState==CURSOR_VALID ){
-          int rc = saveCursorPosition(p);
+          rc = saveCursorPosition(p);
           if( rc!=SQLITE_OK ){
             (void)sqlite3BtreeTripAllCursors(pBtree, rc, 0);
             break;