Fix for compilation with OMIT_AUTOVACUUM defined. Ticket #3940. (CVS 6835)

FossilOrigin-Name: 8f0591ae98c2125a4922933496f4412aee8ab86e

diff --git a/manifest b/manifest
index 01afcc097bfa6da271259849392b2c25de1fc2fa..6642f0e6c5a0819a162f868e5ae2f3dcf5d430a8 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Change\sto\stest\scode\sand\sscripts\sallowing\smemsys3\sto\sbe\stested\susing\sa\sbuild\sthat\shas\sboth\smemsys3\sand\smemsys5\senabled.\s(CVS\s6834)
-D 2009-07-01T18:09:02
+C Fix\sfor\scompilation\swith\sOMIT_AUTOVACUUM\sdefined.\sTicket\s#3940.\s(CVS\s6835)
+D 2009-07-02T05:23:26
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in 8b8fb7823264331210cddf103831816c286ba446
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -106,7 +106,7 @@ F src/auth.c 98db07c2088455797678eb1031f42d4d94d18a71
 F src/backup.c ff50af53184a5fd7bdee4d620b5dabef74717c79
 F src/bitvec.c 0ef0651714728055d43de7a4cdd95e703fac0119
 F src/btmutex.c 9b899c0d8df3bd68f527b0afe03088321b696d3c
-F src/btree.c 078eb41016d033707f8a94075cdde18249e48f75
+F src/btree.c aff035e89ae885ab64acaf339d10411a2c79829b
 F src/btree.h f70b694e8c163227369a66863b01fbff9009f323
 F src/btreeInt.h 55346bc14b939ad41b297942e8b1b581e960fb99
 F src/build.c 867028ee9f63f7bc8eb8d4a720bb98cf9b9a12b4
@@ -738,7 +738,7 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
 F tool/vdbe-compress.tcl 672f81d693a03f80f5ae60bfefacd8a349e76746
-P bfe336a8993e06e70d3c32a929202fb015dcbb89
-R 0f03c3ef155d0847bfc480ff47fa3b16
+P a00aeec21cca7ccf19d4cdef618149aa2773c005
+R 5fe9e3bafbc544bd46fe048a3e0db33e
 U danielk1977
-Z 38cf89225507916cb0e9c0931bd7d0cf
+Z b3ae67dabd40a49c30f3f7417027c9a9

diff --git a/manifest.uuid b/manifest.uuid
index 60596de4e97c302c2cbdec8e27df7b531e3c09db..3cccbecde6b4b4b8a1c3ea6710ce8e728c8ada4d 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-a00aeec21cca7ccf19d4cdef618149aa2773c005
\ No newline at end of file
+8f0591ae98c2125a4922933496f4412aee8ab86e
\ No newline at end of file

diff --git a/src/btree.c b/src/btree.c
index 68f196206fb5f5c31566e45c2073e86a12000d63..e371f6184a964d75a14dfa8cd6b840be5e2764e1 100644 (file)
--- 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.646 2009/06/29 06:00:37 danielk1977 Exp $
+** $Id: btree.c,v 1.647 2009/07/02 05:23:26 danielk1977 Exp $
 **
 ** This file implements a external (disk-based) database using BTrees.
 ** See the header comment on "btreeInt.h" for additional information.
@@ -769,6 +769,7 @@ static int ptrmapGet(BtShared *pBt, Pgno key, u8 *pEType, Pgno *pPgno){
 #else /* if defined SQLITE_OMIT_AUTOVACUUM */
   #define ptrmapPut(w,x,y,z) SQLITE_OK
   #define ptrmapGet(w,x,y,z) SQLITE_OK
+  #define ptrmapPutOvflPtr(x, y) SQLITE_OK
 #endif
 
 /*