A simple change that allows the SQLITE_32BIT_ROWID compile-time option to

work better.

FossilOrigin-Name: f9df4063fbd100ce306a89fc649c1860fd801f31

diff --git a/manifest b/manifest
index 99e12674d4a828c3623b11ea2efce1ba1983ecb2..ff6ebe0f7927d3f21c02e8cdcbb6e468800027df 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\san\sobscure\sbug\sthat\scauses\sa\scrash\swhen\sparsing\scertain\sinvalid\sSQL\nstatements.
-D 2012-02-23T17:35:28.314
+C A\ssimple\schange\sthat\sallows\sthe\sSQLITE_32BIT_ROWID\scompile-time\soption\sto\nwork\sbetter.
+D 2012-02-24T00:02:28.766
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 3f79a373e57c3b92dabf76f40b065e719d31ac34
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -240,7 +240,7 @@ F src/update.c d3076782c887c10e882996550345da9c4c9f9dea
 F src/utf.c 890c67dcfcc7a74623c95baac7535aadfe265e84
 F src/util.c 906731099c4397bf8adf3fa90a833355e7472af0
 F src/vacuum.c 0c0ba2242355c6048d65e2b333abe0f7c06348fa
-F src/vdbe.c 21c17c43e579789959efea50f100de60efbb955c
+F src/vdbe.c 32720e873ed0a23e6ee928b676cd995864b984d6
 F src/vdbe.h 18f581cac1f4339ec3299f3e0cc6e11aec654cdb
 F src/vdbeInt.h 6ff4180a05683566a8835d12f7ec504b22932c82
 F src/vdbeapi.c 3662b6a468a2a4605a15dfab313baa6dff81ad91
@@ -990,7 +990,7 @@ F tool/tostr.awk e75472c2f98dd76e06b8c9c1367f4ab07e122d06
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
 F tool/warnings-clang.sh 9f406d66e750e8ac031c63a9ef3248aaa347ef2a
 F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
-P f0640615f25ebe8bf2eed0e1a0f2e309471889fe
-R 386c50c5bbaa55f00d88b4b7b8d3f590
+P c8c7846fb990199dcc0774a69e8257510bc36f2d
+R c536366575fdc7c1acdfd3976080e3e1
 U drh
-Z 9c1aa4f559c8a629e9a1fae5ce79c6c5
+Z e5f81487e506b4905e600ae695ff035e

diff --git a/manifest.uuid b/manifest.uuid
index 4299d784891f76695efac1a3e47e6e9e1bc468e2..479220e76886533b67e2db50cb52c0dcb3c3ab99 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-c8c7846fb990199dcc0774a69e8257510bc36f2d
\ No newline at end of file
+f9df4063fbd100ce306a89fc649c1860fd801f31
\ No newline at end of file

diff --git a/src/vdbe.c b/src/vdbe.c
index 81cc0c3d4cf3de875ffd7e5cbac33a38de54d7c1..749830bc0da2cf32f8881e087c609d0a86253455 100644 (file)
--- a/src/vdbe.c
+++ b/src/vdbe.c
@@ -3844,7 +3844,7 @@ case OP_NewRowid: {           /* out2-prerelease */
           assert( sqlite3BtreeCursorIsValid(pC->pCursor) );
           rc = sqlite3BtreeKeySize(pC->pCursor, &v);
           assert( rc==SQLITE_OK );   /* Cannot fail following BtreeLast() */
-          if( v==MAX_ROWID ){
+          if( v>=MAX_ROWID ){
             pC->useRandomRowid = 1;
           }else{
             v++;   /* IMP: R-29538-34987 */