Get the build working with SQLITE_OMIT_CONCURRENT.

FossilOrigin-Name: a29401e924e6f82ca1c3eec98c6c0b2f1d5b9d7fba9af41a78516f21a7bab3a2

diff --git a/manifest b/manifest
index 96896f870839de752d867de878af6b5069ffcfda..6ae55d542ab8343bb48e3236fa129eee9edc90c3 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Merge\sall\sthe\slatest\strunk\senhancements.
-D 2017-07-20T17:47:12.460
+C Get\sthe\sbuild\sworking\swith\sSQLITE_OMIT_CONCURRENT.
+D 2017-07-20T18:28:33.979
 F Makefile.in d9873c9925917cca9990ee24be17eb9613a668012c85a343aef7e5536ae266e8
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc 02b469e9dcd5b7ee63fc1fb05babc174260ee4cfa4e0ef2e48c3c6801567a016
@@ -399,9 +399,9 @@ F src/auth.c 79f96c6f33bf0e5da8d1c282cee5ebb1852bb8a6ccca3e485d7c459b035d9c3c
 F src/backup.c faf17e60b43233c214aae6a8179d24503a61e83b
 F src/bitvec.c c77b7f5759e413c1c8b53267d633c952e66db79c1171964c7e24c0f92f5019cf
 F src/btmutex.c 0e9ce2d56159b89b9bc8e197e023ee11e39ff8ca
-F src/btree.c b3d5ea919c2eef869306ec09e1b6e64a8b9fdd7421f93e6913f5c48b51b4ea6c
+F src/btree.c 7e9673478702a5b26ebbbfc1e55a1f0b60bc147a52742db86f781e9fe96c6ecc
 F src/btree.h e8045998d865a21de226a417467cc64cf9d66e41b91b7436539f99ee464b5402
-F src/btreeInt.h 70236a051364c7d4b8c0513b118925a61cd24c2511ef3991e62732cfc8624c15
+F src/btreeInt.h 4a4cc19595e98c471c05cd9d7fc824da3397c303c7293019f4df7706caacf2fe
 F src/build.c 62faff0876fdce2b18f14312e3e891f3f366ee493c8fb48d844f9cbae15e6a02
 F src/callback.c 8e14b60d1ed1c87c02cb5f121ecda99224f2aea6524a77ee6f72c9b5c7110f84
 F src/complete.c a3634ab1e687055cd002e11b8f43eb75c17da23e
@@ -444,7 +444,7 @@ F src/os_unix.c 30e2c43e4955db990e5b5a81e901f8aa74cc8820
 F src/os_win.c 2a6c73eef01c51a048cc4ddccd57f981afbec18a
 F src/os_win.h 7b073010f1451abe501be30d12f6bc599824944a
 F src/pager.c 7666599a49ff5098cfaea232cae118ad9afda37a96c9afa8f6db656a977c9cb6
-F src/pager.h ba7b3fbb18f78835a7368d66530bf21d6782e3e640d79c9550d218742c0b07ce
+F src/pager.h 13713b181c041691a2bb7afbfbc4aa66c5addd34c46b1e68429eab75a5cfa632
 F src/parse.y e4dbcc6136fc4f3084cedd41036401eafd336c5f7cb33bc516fed913a46cac2a
 F src/pcache.c 62835bed959e2914edd26afadfecce29ece0e870
 F src/pcache.h 521bb9610d38ef17a3cc9b5ddafd4546c2ea67fa3d0e464823d73c2a28d50e11
@@ -1648,7 +1648,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 79544fc2856f30cac8b0962d00698974e8918562f09769a68264d17e1e1176fe a90c062d46c63a1e6f83064b1c5afb26a16e93b6ee8620ca46d169fdb325c488
-R 5ca93a16d61103201899491d16be4992
+P 213c61cb82d4ee51cc638fc5bb2b54cd51b963c40d088b2f01caf77032ea32fb
+R d95fefd02901737ecfdecd42852575c7
 U drh
-Z 646329efaa2d2b6e9e011be806365053
+Z fe3c771992759cd0f7884a1e6c1e626c

diff --git a/manifest.uuid b/manifest.uuid
index 4fc907c6af2908932920f89bf145b3708b7e539c..7b0dec5b1a3b598c2a5b2bd5463cd9ba8871f768 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-213c61cb82d4ee51cc638fc5bb2b54cd51b963c40d088b2f01caf77032ea32fb
\ No newline at end of file
+a29401e924e6f82ca1c3eec98c6c0b2f1d5b9d7fba9af41a78516f21a7bab3a2
\ No newline at end of file

diff --git a/src/btree.c b/src/btree.c
index ca9e42af7b774713a49b364d88f829f80e4481db..711e20fddaa65564da9055bb90caf541f33fc194 100644 (file)
--- a/src/btree.c
+++ b/src/btree.c
@@ -10314,6 +10314,9 @@ int sqlite3BtreeExclusiveLock(Btree *p){
   assert( p->inTrans==TRANS_WRITE && pBt->pPage1 );
   sqlite3BtreeEnter(p);
   rc = sqlite3PagerExclusiveLock(pBt->pPager, pBt->pPage1->pDbPage, &pgno);
+#ifdef SQLITE_OMIT_CONCURRENT
+  assert( pgno==0 );
+#else
   if( rc==SQLITE_BUSY_SNAPSHOT && pgno ){
     PgHdr *pPg = 0;
     int rc2 = sqlite3PagerGet(pBt->pPager, pgno, &pPg, 0);
@@ -10362,7 +10365,7 @@ int sqlite3BtreeExclusiveLock(Btree *p){
       );
     }
   }
-
+#endif
   sqlite3BtreeLeave(p);
   return rc;
 }

diff --git a/src/btreeInt.h b/src/btreeInt.h
index fff805b962b9d274454123a1c8c25cc4be452b15..44f1e015fb6355459c7f1210721a17e1b4fd1409 100644 (file)
--- a/src/btreeInt.h
+++ b/src/btreeInt.h
@@ -277,6 +277,9 @@ struct MemPage {
   u8 intKey;           /* True if table b-trees.  False for index b-trees */
   u8 intKeyLeaf;       /* True if the leaf of an intKey table */
   Pgno pgno;           /* Page number for this page */
+#ifndef SQLITE_OMIT_CONCURRENT
+  Pgno pgnoRoot;       /* Root page of b-tree that this page belongs to */
+#endif
   /* Only the first 8 bytes (above) are zeroed by pager.c when a new page
   ** is allocated. All fields that follow must be initialized before use */
   u8 leaf;             /* True if a leaf page */
@@ -301,9 +304,6 @@ struct MemPage {
   DbPage *pDbPage;     /* Pager page handle */
   u16 (*xCellSize)(MemPage*,u8*);             /* cellSizePtr method */
   void (*xParseCell)(MemPage*,u8*,CellInfo*); /* btreeParseCell method */
-#ifndef SQLITE_OMIT_CONCURRENT
-  u32 pgnoRoot;        /* Root page of b-tree that this page belongs to */
-#endif
 };
 
 /*

diff --git a/src/pager.h b/src/pager.h
index 8aa17c4553ef7f2a333b08a387fe050985f09742..7b02818b2ffc5318fe6da03553b4a29cd3b6e507 100644 (file)
--- a/src/pager.h
+++ b/src/pager.h
@@ -229,7 +229,9 @@ int sqlite3PagerIsWal(Pager*);
 # define sqlite3PagerEndConcurrent(x)
 #endif
 
+#if !defined(SQLITE_DEBUG) && !defined(SQLITE_OMIT_CONCURRENT)
 int sqlite3PagerIswriteable(DbPage*);
+#endif
 
 int sqlite3PagerWalInfo(Pager*, u32 *pnPrior, u32 *pnFrame);