Omit mutex variables in the pager when threadsafe is disabled. (CVS 5095)

FossilOrigin-Name: d15d0bbab043e4366f7988423115babb550198a1

diff --git a/manifest b/manifest
index 0cccf21a59f7ac670ff8e0eb3906777451652bbe..6fbb7dd7e9429b8fa76253e28ea75b9336ade517 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sa\sproblem\scausing\sthe\sdatabase\sto\sbe\struncated\sto\sthe\swrong\ssize\safter\san\sincremental-vacuum\sis\sperformed\son\sa\sdatabase\sin\sfull\sauto-vacuum\smode.\s(CVS\s5094)
-D 2008-05-07T07:13:16
+C Omit\smutex\svariables\sin\sthe\spager\swhen\sthreadsafe\sis\sdisabled.\s(CVS\s5095)
+D 2008-05-07T12:29:56
 F Makefile.arm-wince-mingw32ce-gcc ac5f7b2cef0cd850d6f755ba6ee4ab961b1fadf7
 F Makefile.in 8b9b8263852f0217157f9042b8e3dae7427ec739
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -121,7 +121,7 @@ F src/os_common.h e8b748b2f2ecc8a498e50bfe5d8721f189c19d2a
 F src/os_os2.c 30c378b093d9c17387ebb0ebbf21b7d55a98202b
 F src/os_unix.c a810e2aefdaddacf479407f76f8f4ca381d231b2
 F src/os_win.c 3a60bddd07ea6f8adb2314dd5996ac97b988f403
-F src/pager.c 22a5a810a3eadf8fe84c3de479def9c0dadc5ff8
+F src/pager.c bc506fe98357d6be270c226f7593cdd7b7ef6f79
 F src/pager.h 4f051fd856de6fd3c19aef5f82eace54122b9173
 F src/parse.y fc4bd35c6088901f7c8daead26c6fb11c87d22e7
 F src/pragma.c 2e4bb2e76e48a32750529fdc4bfe86ac5f54e01b
@@ -632,7 +632,7 @@ F www/tclsqlite.tcl 8be95ee6dba05eabcd27a9d91331c803f2ce2130
 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
 F www/version3.tcl 890248cf7b70e60c383b0e84d77d5132b3ead42b
 F www/whentouse.tcl fc46eae081251c3c181bd79c5faef8195d7991a5
-P 7df9ef2c8216133d50bf4737482f51193e8579b0
-R 14f8a574b4483be783cee8a7650c2f1e
-U danielk1977
-Z 434c9485cd0945d9b455f8954f84eb61
+P ed98df24a3362c2d20f52bb1ce679787b3ee408b
+R b674e29d0c635e566d4d022cc3c91e32
+U drh
+Z 2bfb50f482bb16c5a2226fe3210bd145

diff --git a/manifest.uuid b/manifest.uuid
index a96c02a241185707bbc9e8d23cfc64c2f8d91b14..a7d8c0da18a8cd9f5da54362d1dc3928a28e8f23 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-ed98df24a3362c2d20f52bb1ce679787b3ee408b
\ No newline at end of file
+d15d0bbab043e4366f7988423115babb550198a1
\ No newline at end of file

diff --git a/src/pager.c b/src/pager.c
index dd691c2eebc3b0f098cf277eaadf2f12b3e5f338..5fdf999b246f3b0c8f6d26c0d8f6ce6b9677653b 100644 (file)
--- a/src/pager.c
+++ b/src/pager.c
@@ -18,7 +18,7 @@
 ** file simultaneously, or one process from reading the database while
 ** another is writing.
 **
-** @(#) $Id: pager.c,v 1.440 2008/05/06 18:13:26 danielk1977 Exp $
+** @(#) $Id: pager.c,v 1.441 2008/05/07 12:29:56 drh Exp $
 */
 #ifndef SQLITE_OMIT_DISKIO
 #include "sqliteInt.h"
@@ -515,8 +515,8 @@ static const unsigned char aJournalMagic[] = {
   static void pagerEnter(Pager *p){
     p->iInUseDB++;
     if( p->iInUseMM && p->iInUseDB==1 ){
-      sqlite3_mutex *mutex;
 #ifndef SQLITE_MUTEX_NOOP
+      sqlite3_mutex *mutex;
       mutex = sqlite3_mutex_alloc(SQLITE_MUTEX_STATIC_MEM2);
 #endif
       p->iInUseDB = 0;
@@ -3227,7 +3227,6 @@ static int pager_recycle(Pager *pPager, PgHdr **ppPg){
 */
 int sqlite3PagerReleaseMemory(int nReq){
   int nReleased = 0;          /* Bytes of memory released so far */
-  sqlite3_mutex *mutex;       /* The MEM2 mutex */
   Pager *pPager;              /* For looping over pagers */
   BusyHandler *savedBusy;     /* Saved copy of the busy handler */
   int rc = SQLITE_OK;
@@ -3235,6 +3234,7 @@ int sqlite3PagerReleaseMemory(int nReq){
   /* Acquire the memory-management mutex
   */
 #ifndef SQLITE_MUTEX_NOOP
+  sqlite3_mutex *mutex;       /* The MEM2 mutex */
   mutex = sqlite3_mutex_alloc(SQLITE_MUTEX_STATIC_MEM2);
 #endif
   sqlite3_mutex_enter(mutex);