Fix the build for when -DSQLITE_SMALL_STACK is used.

FossilOrigin-Name: b9eda2249ab5cf523093e4849c317d9a4b1743f7e15d96bdd6bb6cc423302914

diff --git a/manifest b/manifest
index ae8a1b31d895a8344e7240a18508b0ad81891aa8..1090d858b8bf51c17259e77f0fbfcc47533233c1 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Improved\sfix\sfor\sticket\s[ced41c7c7d6b4d36]\sthat\skeeps\sskip-scan\senabled,\nbut\savoids\sidentifying\sa\sskip-scan\sas\sorder-distinct\s(because\sit\sis\snot)\nand\sthus\sforces\sa\sseparate\sb-tree\sto\simplement\sthe\sDISTINCT\sclause\sof\sa\nquery.\s\sThis\sundoes\scheck-in\s[a871d69c6de65038]\sand\ssubstitutes\sa\snew\sfix.
-D 2019-07-30T14:22:10.200
+C Fix\sthe\sbuild\sfor\swhen\s-DSQLITE_SMALL_STACK\sis\sused.
+D 2019-07-30T21:00:13.643
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -595,7 +595,7 @@ F src/upsert.c 0dd81b40206841814d46942a7337786932475f085716042d0cb2fc7791bf8ca4
 F src/utf.c 2f0fac345c7660d5c5bd3df9e9d8d33d4c27f366bcfb09e07443064d751a0507
 F src/util.c aef606a78b85d042138a841babbc0f98471b19b9a340b962e8fae307bc8cf3da
 F src/vacuum.c 82dcec9e7b1afa980288718ad11bc499651c722d7b9f32933c4d694d91cb6ebf
-F src/vdbe.c 8e9afa99c79cac271fac32ad8c4b758f8e1310df850fb6d6f63ed2babbab85db
+F src/vdbe.c 4d542e9fc51d4dd35c4c0c6e58d56bc168a6a221f71b065dfd52950bd567a8ca
 F src/vdbe.h 712bca562eaed1c25506b9faf9680bdc75fc42e2f4a1cd518d883fa79c7a4237
 F src/vdbeInt.h 889c52272a02cea8af6e21b493b08bc9a043e3372a77fdfe838d25e73a47ac92
 F src/vdbeapi.c f9161e5c77f512fbb80091ce8af621d19c9556bda5e734cffaac1198407400da
@@ -1838,7 +1838,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P a871d69c6de65038360aa6142fbad22689fb347e526cca56bb83e695c1441fbe
-R 277630844b23a68da6a6e28edcb71a9f
+P 89bf0399e87be76e7b264e0a35e8a6d3af0f9e71123a929c20754882b636ca70
+R 7f40d3e7a173a03d17ea66296173b371
 U drh
-Z 6873f4d0939662a6f4dc4c5cfa6fb08a
+Z ea6e4405731827a0308cc422416a8eca

diff --git a/manifest.uuid b/manifest.uuid
index 9a232bb1b5fb3e0019cc8884bae179644ff175a9..1cc4ae2c906e12fc150d76061f7e0bd281c83487 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-89bf0399e87be76e7b264e0a35e8a6d3af0f9e71123a929c20754882b636ca70
\ No newline at end of file
+b9eda2249ab5cf523093e4849c317d9a4b1743f7e15d96bdd6bb6cc423302914
\ No newline at end of file

diff --git a/src/vdbe.c b/src/vdbe.c
index b7f37b59c4f08c8f27026596e40eb7ca90bab8b1..049c6f14675bcb62a0ef7ca3e47bf47d61a27d80 100644 (file)
--- a/src/vdbe.c
+++ b/src/vdbe.c
@@ -2984,37 +2984,37 @@ case OP_MakeRecord: {
     }else if( pRec->flags & (MEM_Int|MEM_IntReal) ){
       /* Figure out whether to use 1, 2, 4, 6 or 8 bytes. */
       i64 i = pRec->u.i;
-      u64 u;
+      u64 uu;
       testcase( pRec->flags & MEM_Int );
       testcase( pRec->flags & MEM_IntReal );
       if( i<0 ){
-        u = ~i;
+        uu = ~i;
       }else{
-        u = i;
+        uu = i;
       }
       nHdr++;
-      testcase( u==127 );               testcase( u==128 );
-      testcase( u==32767 );             testcase( u==32768 );
-      testcase( u==8388607 );           testcase( u==8388608 );
-      testcase( u==2147483647 );        testcase( u==2147483648 );
-      testcase( u==140737488355327LL ); testcase( u==140737488355328LL );
-      if( u<=127 ){
+      testcase( uu==127 );               testcase( uu==128 );
+      testcase( uu==32767 );             testcase( uu==32768 );
+      testcase( uu==8388607 );           testcase( uu==8388608 );
+      testcase( uu==2147483647 );        testcase( uu==2147483648 );
+      testcase( uu==140737488355327LL ); testcase( uu==140737488355328LL );
+      if( uu<=127 ){
         if( (i&1)==i && file_format>=4 ){
-          pRec->uTemp = 8+(u32)u;
+          pRec->uTemp = 8+(u32)uu;
         }else{
           nData++;
           pRec->uTemp = 1;
         }
-      }else if( u<=32767 ){
+      }else if( uu<=32767 ){
         nData += 2;
         pRec->uTemp = 2;
-      }else if( u<=8388607 ){
+      }else if( uu<=8388607 ){
         nData += 3;
         pRec->uTemp = 3;
-      }else if( u<=2147483647 ){
+      }else if( uu<=2147483647 ){
         nData += 4;
         pRec->uTemp = 4;
-      }else if( u<=140737488355327LL ){
+      }else if( uu<=140737488355327LL ){
         nData += 6;
         pRec->uTemp = 5;
       }else{