From: drh <drh@noemail.net>
Date: Wed, 22 Mar 2006 22:10:07 +0000 (+0000)
Subject: Get the build to run with -DSQLITE_OMIT_SHARED_CACHE. (CVS 3145)
X-Git-Tag: version-3.6.10~3022
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a154dcd7060edc4567ab94d8b862ea7e2e2aae38;p=thirdparty%2Fsqlite.git

Get the build to run with -DSQLITE_OMIT_SHARED_CACHE. (CVS 3145)

FossilOrigin-Name: 15e3b183bc554f729ce99c7daa5e36cdbcfa93fa
---

diff --git a/manifest b/manifest
index 024aff7c50..0c47457df7 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Increase\stest\scoverage\sto\sabove\s98%.\s(CVS\s3144)
-D 2006-03-19T13:00:25
+C Get\sthe\sbuild\sto\srun\swith\s-DSQLITE_OMIT_SHARED_CACHE.\s(CVS\s3145)
+D 2006-03-22T22:10:08
 F Makefile.in 5d8dff443383918b700e495de42ec65bc1c8865b
 F Makefile.linux-gcc 74ba0eadf88748a9ce3fd03d2a3ede2e6715baec
 F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028
@@ -34,7 +34,7 @@ F src/alter.c 451b34fc4eb2475ca76a2e86b21e1030a9428091
 F src/analyze.c 7d2b7ab9a9c2fd6e55700f69064dfdd3e36d7a8a
 F src/attach.c d73a3505de3fb9e373d0a158978116c4212031d0
 F src/auth.c 9ae84d2d94eb96195e04515715e08e85963e96c2
-F src/btree.c caf4b7477b6667dcf4ca4eb9024826cab6877d87
+F src/btree.c 3f9f3fac30722635517e1b633762b383d6c091a7
 F src/btree.h 40055cfc09defd1146bc5b922399c035f969e56d
 F src/build.c 4bd8471e4f20f5623c15fd71d2aaee0f66e394d8
 F src/callback.c d8c5ab1cd6f3b7182b2ee63bf53f1b69c0f74306
@@ -79,17 +79,17 @@ F src/test3.c 86e99724ee898b119ed575ef9f98618afe7e5e5d
 F src/test4.c 8b784cd82de158a2317cb4ac4bc86f91ad315e25
 F src/test5.c 7162f8526affb771c4ed256826eee7bb9eca265f
 F src/test6.c 60a02961ceb7b3edc25f5dc5c1ac2556622a76de
-F src/test7.c d28d3e62f9594923648fc6a8fb030eba36564ba1
+F src/test7.c 03fa8d787f6aebc6d1f72504d52f33013ad2c8e3
 F src/test_async.c e3deaedd4d86a56391b81808fde9e44fbd92f1d3
 F src/test_md5.c 6c42bc0a3c0b54be34623ff77a0eec32b2fa96e3
-F src/test_server.c 087b92a39d883e3fa113cae259d64e4c7438bc96
+F src/test_server.c a6460daed0b92ecbc2531b6dc73717470e7a648c
 F src/tokenize.c 382b3bb0ca26eb9153b5d20b246ef512a114a24f
 F src/trigger.c 6e63d6d8104a395d6a472d2678a62f1cf6140a6d
 F src/update.c 34add66fcd3301b33b6e4c4c813f4e408f7ee4a0
 F src/utf.c 1d51225bce1ea8d1978e8ab28e862a0c12c7a8e8
 F src/util.c 59389ed717f0fa9d8023b3f482ba09dcf41343a8
 F src/vacuum.c 5b37d0f436f8e1ffacd17934e44720b38d2247f9
-F src/vdbe.c dcc469dabef9462b3e8bc77193f83a57f3084363
+F src/vdbe.c a56ef5de6d91aedf6f1f0db03c65aa01ecbe11ba
 F src/vdbe.h 44ff995a8b4e87016794095273e9e7300f0001bb
 F src/vdbeInt.h 85cd5f81d38edb1b8f4786f407c77a7a3ba636fb
 F src/vdbeapi.c 7dc662e7c905ce666bb506dced932e0307115cbf
@@ -355,7 +355,7 @@ F www/tclsqlite.tcl bb0d1357328a42b1993d78573e587c6dcbc964b9
 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
 F www/version3.tcl 890248cf7b70e60c383b0e84d77d5132b3ead42b
 F www/whentouse.tcl 97e2b5cd296f7d8057e11f44427dea8a4c2db513
-P 8f60139f688903f0e635b0a904ab9ca401fbe71f
-R 707703c2ca060ba4895ca4d552db9f64
+P 8ae6ccc715b081cd422e847cd9e5cc22b04d8512
+R b79fbe7fb8192652eac7593ec87ed9d8
 U drh
-Z 3e0248fc76ba37aacd5663fd5b64af16
+Z d653181aec4bc727423b2c5df88a6017
diff --git a/manifest.uuid b/manifest.uuid
index b293573e85..a6a69435f3 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-8ae6ccc715b081cd422e847cd9e5cc22b04d8512
\ No newline at end of file
+15e3b183bc554f729ce99c7daa5e36cdbcfa93fa
\ No newline at end of file
diff --git a/src/btree.c b/src/btree.c
index eb32dba3ea..cdfed1a513 100644
--- a/src/btree.c
+++ b/src/btree.c
@@ -9,7 +9,7 @@
 **    May you share freely, never taking more than you give.
 **
 *************************************************************************
-** $Id: btree.c,v 1.320 2006/03/14 12:59:10 drh Exp $
+** $Id: btree.c,v 1.321 2006/03/22 22:10:08 drh Exp $
 **
 ** This file implements a external (disk-based) database using BTrees.
 ** For a detailed discussion of BTrees, refer to
@@ -6620,17 +6620,23 @@ int sqlite3BtreeSchemaLocked(Btree *p){
   return (queryTableLock(p, MASTER_ROOT, READ_LOCK)!=SQLITE_OK);
 }
 
+
+#ifndef SQLITE_OMIT_SHARED_CACHE
+/*
+** Obtain a lock on the table whose root page is iTab.  The
+** lock is a write lock if isWritelock is true or a read lock
+** if it is false.
+*/
 int sqlite3BtreeLockTable(Btree *p, int iTab, u8 isWriteLock){
   int rc = SQLITE_OK;
-#ifndef SQLITE_OMIT_SHARED_CACHE
   u8 lockType = (isWriteLock?WRITE_LOCK:READ_LOCK);
   rc = queryTableLock(p, iTab, lockType);
   if( rc==SQLITE_OK ){
     rc = lockTable(p, iTab, lockType);
   }
-#endif
   return rc;
 }
+#endif
 
 /*
 ** The following debugging interface has to be in this file (rather
@@ -6645,6 +6651,7 @@ int sqlite3_shared_cache_report(
   int objc,
   Tcl_Obj *CONST objv[]
 ){
+#ifndef SQLITE_OMIT_SHARED_CACHE
   const ThreadData *pTd = sqlite3ThreadDataReadOnly();
   if( pTd->useSharedData ){
     BtShared *pBt;
@@ -6656,6 +6663,7 @@ int sqlite3_shared_cache_report(
     }
     Tcl_SetObjResult(interp, pRet);
   }
+#endif
   return TCL_OK;
 }
 #endif
diff --git a/src/test7.c b/src/test7.c
index 1adb4a016b..268229848f 100644
--- a/src/test7.c
+++ b/src/test7.c
@@ -12,7 +12,7 @@
 ** Code for testing the client/server version of the SQLite library.
 ** Derived from test4.c.
 **
-** $Id: test7.c,v 1.3 2006/01/20 17:56:33 drh Exp $
+** $Id: test7.c,v 1.4 2006/03/22 22:10:08 drh Exp $
 */
 #include "sqliteInt.h"
 #include "tcl.h"
@@ -22,7 +22,8 @@
 ** This test only works on UNIX with a THREADSAFE build that includes
 ** the SQLITE_SERVER option.
 */
-#if OS_UNIX && defined(THREADSAFE) && THREADSAFE==1 && defined(SQLITE_SERVER)
+#if OS_UNIX && defined(THREADSAFE) && THREADSAFE==1 && \
+    defined(SQLITE_SERVER) && !defined(SQLITE_OMIT_SHARED_CACHE)
 
 #include <stdlib.h>
 #include <string.h>
diff --git a/src/test_server.c b/src/test_server.c
index d32c59007b..5929bd497b 100644
--- a/src/test_server.c
+++ b/src/test_server.c
@@ -200,7 +200,7 @@
 ** Only compile the code in this file on UNIX with a THREADSAFE build
 ** and only if the SQLITE_SERVER macro is defined.
 */
-#ifdef SQLITE_SERVER
+#if defined(SQLITE_SERVER) && !defined(SQLITE_OMIT_SHARED_CACHE)
 #if defined(OS_UNIX) && OS_UNIX && defined(THREADSAFE) && THREADSAFE
 
 /*
diff --git a/src/vdbe.c b/src/vdbe.c
index 165ba2554b..239e3649c5 100644
--- a/src/vdbe.c
+++ b/src/vdbe.c
@@ -43,7 +43,7 @@
 ** in this file for details.  If in doubt, do not deviate from existing
 ** commenting and indentation practices when changing or adding code.
 **
-** $Id: vdbe.c,v 1.547 2006/03/17 00:26:00 drh Exp $
+** $Id: vdbe.c,v 1.548 2006/03/22 22:10:08 drh Exp $
 */
 #include "sqliteInt.h"
 #include "os.h"
@@ -4498,7 +4498,7 @@ case OP_Expire: {        /* no-push */
 ** Obtain a lock on a particular table. This instruction is only used when
 ** the shared-cache feature is enabled. 
 **
-** If P1 is not negative, then it is the index of the index of the database
+** If P1 is not negative, then it is the index of the database
 ** in sqlite3.aDb[] and a read-lock is required. If P1 is negative, a 
 ** write-lock is required. In this case the index of the database is the 
 ** absolute value of P1 minus one (iDb = abs(P1) - 1;) and a write-lock is