From: drh <drh@noemail.net>
Date: Sat, 31 Dec 2016 18:37:50 +0000 (+0000)
Subject: In speedtest1.c, make the "--lookaside 0 0" option completely disable lookaside.
X-Git-Tag: version-3.17.0~149^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fheads%2Fspeedtest1;p=thirdparty%2Fsqlite.git

In speedtest1.c, make the "--lookaside 0 0" option completely disable lookaside.

FossilOrigin-Name: 52b99bcbf18f34196ec29f829c6af539e0d05524
---

diff --git a/manifest b/manifest
index 99ed22e9a4..4cfc3df485 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Minor\s#include\schange\sto\sspeedtest1.c\sso\sthat\sit\swill\scompile\sunder\sMSVC.
-D 2016-12-31T14:33:05.615
+C In\sspeedtest1.c,\smake\sthe\s"--lookaside\s0\s0"\soption\scompletely\sdisable\slookaside.
+D 2016-12-31T18:37:50.583
 F Makefile.in 41bd4cad981487345c4a84081074bcdb876e4b2e
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc b8ca53350ae545e3562403d5da2a69cec79308da
@@ -1127,7 +1127,7 @@ F test/speed3.test 694affeb9100526007436334cf7d08f3d74b85ef
 F test/speed4.test abc0ad3399dcf9703abed2fff8705e4f8e416715
 F test/speed4p.explain 6b5f104ebeb34a038b2f714150f51d01143e59aa
 F test/speed4p.test 0e51908951677de5a969b723e03a27a1c45db38b
-F test/speedtest1.c 2feca857787efbcb8aefcc7b6fdc83455bcaa582
+F test/speedtest1.c 4e8ea6165046f02e1cfe0f4700256e91c981ec10
 F test/spellfix.test f9c1f431e2c096c8775fec032952320c0e4700db
 F test/spellfix2.test dfc8f519a3fc204cb2dfa8b4f29821ae90f6f8c3
 F test/spellfix3.test 0f9efaaa502a0e0a09848028518a6fb096c8ad33
@@ -1541,10 +1541,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 14d855d2b2b5b3485e0673d11405db7266b34c6d
-R 4e28a4a24a558a17288e2b686fdb973b
-T *branch * speedtest1
-T *sym-speedtest1 *
-T -sym-trunk *
+P 8c28fde004678c85524770969eb001719b109179
+R acfc06f8e952c64d6314c2acd8585e0b
 U drh
-Z cb0ac3a36d5b0ce57e9784586a6bed06
+Z 4942b94b2df861c6d70e7d58a0ed32ea
diff --git a/manifest.uuid b/manifest.uuid
index 3005918343..670dc579e2 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-8c28fde004678c85524770969eb001719b109179
\ No newline at end of file
+52b99bcbf18f34196ec29f829c6af539e0d05524
\ No newline at end of file
diff --git a/test/speedtest1.c b/test/speedtest1.c
index 09aef40fdf..02d55d5974 100644
--- a/test/speedtest1.c
+++ b/test/speedtest1.c
@@ -1378,7 +1378,7 @@ int main(int argc, char **argv){
   int doIncrvac = 0;            /* True for --incrvacuum */
   const char *zJMode = 0;       /* Journal mode */
   const char *zKey = 0;         /* Encryption key */
-  int nLook = 0, szLook = 0;    /* --lookaside configuration */
+  int nLook = -1, szLook = 0;   /* --lookaside configuration */
   int noSync = 0;               /* True for --nosync */
   int pageSize = 0;             /* Desired page size.  0 means default */
   int nPCache = 0, szPCache = 0;/* --pcache configuration */
@@ -1562,7 +1562,7 @@ int main(int argc, char **argv){
     rc = sqlite3_config(SQLITE_CONFIG_SCRATCH, pScratch, szScratch, nScratch);
     if( rc ) fatal_error("scratch configuration failed: %d\n", rc);
   }
-  if( nLook>0 ){
+  if( nLook>=0 ){
     sqlite3_config(SQLITE_CONFIG_LOOKASIDE, 0, 0);
   }
 #endif