diff --git a/manifest b/manifest index 3b14306bc2..66c23d272e 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Fix\sthe\sbuild\sscripts\sso\sthat\sthey\sgenerate\sTcl\sbindings\sfor\swindows\ncorrectly.\s(CVS\s4086) -D 2007-06-18T16:06:20 +C Bring\sthe\spager_datahash()\smacro\sinto\ssync\swith\sits\sfunction\sdefinition.\nTicket\s#2422.\s(CVS\s4087) +D 2007-06-18T17:25:18 F Makefile.in b9971ab07868cf2b3209fe3bf8c52e7e25af4193 F Makefile.linux-gcc 2d8574d1ba75f129aba2019f0b959db380a90935 F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028 @@ -94,7 +94,7 @@ F src/os_unix.c f2ccf2e9a925fc679faf7a8fe85700e0f13cf0e1 F src/os_unix.h 5768d56d28240d3fe4537fac08cc85e4fb52279e F src/os_win.c d868d5f9e95ec9c1b9e2a30c54c996053db6dddd F src/os_win.h 41a946bea10f61c158ce8645e7646b29d44f122b -F src/pager.c 9eeb505af0ff7abc339b6825754a884e822fa4a2 +F src/pager.c 39352b58ee840cae715a4f0d20e446aa5e1445fe F src/pager.h 94110a5570dca30d54a883e880a3633b2e4c05ae F src/parse.y 2ed1d91fdcb4ae7ae7d1f4674544297807c7cc26 F src/pragma.c 0d25dad58bdfd6789943a10f1b9663c2eb85b96d @@ -506,7 +506,7 @@ F www/tclsqlite.tcl bb0d1357328a42b1993d78573e587c6dcbc964b9 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0 F www/version3.tcl 890248cf7b70e60c383b0e84d77d5132b3ead42b F www/whentouse.tcl fc46eae081251c3c181bd79c5faef8195d7991a5 -P 2647980fba92a453ef8afb48c80405d023177ab6 -R a9308379f43e01fbc38ff18317659a07 +P c7be8b419fdfe6561331485f5f866610457e44ad +R 860860c6c948060af4aca75438b38d78 U drh -Z d44f3659a70767def6d2822d776a1e54 +Z dc54e29e414be75fc5bd44a0f2d023fe diff --git a/manifest.uuid b/manifest.uuid index 896769d9d2..9ced892a5f 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -c7be8b419fdfe6561331485f5f866610457e44ad \ No newline at end of file +ba967bbb62ccf29438db352c573773ae741d0daf \ No newline at end of file diff --git a/src/pager.c b/src/pager.c index 81c31c6dea..99c1f7934a 100644 --- 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.347 2007/06/16 18:39:42 drh Exp $ +** @(#) $Id: pager.c,v 1.348 2007/06/18 17:25:18 drh Exp $ */ #ifndef SQLITE_OMIT_DISKIO #include "sqliteInt.h" @@ -619,7 +619,7 @@ static void checkPage(PgHdr *pPg){ } #else -#define pager_datahash(X) 0 +#define pager_datahash(X,Y) 0 #define pager_pagehash(X) 0 #define CHECK_PAGE(x) #endif