Remove a stray merge-sort related change from pager.c and pager.h.

FossilOrigin-Name: 69823ed163049d6fa1e24a9810c3c99f2a8fdd46

diff --git a/manifest b/manifest
index 0e87842350f812acfbf410d16986f4b6ecae5ac4..d87393cb83f230d02771ecf3dea321b299ddec48 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\sa\snew\sscript\sto\sbuild\san\samalgamation\sthat\somits\sFTS3/4\sand\sRTREE.
-D 2011-09-17T17:29:20.058
+C Remove\sa\sstray\smerge-sort\srelated\schange\sfrom\spager.c\sand\spager.h.
+D 2011-09-19T11:57:34.680
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in d314143fa6be24828021d3f583ad37d9afdce505
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -167,8 +167,8 @@ F src/os_common.h 92815ed65f805560b66166e3583470ff94478f04
 F src/os_os2.c 4a75888ba3dfc820ad5e8177025972d74d7f2440
 F src/os_unix.c 10e0c4dcdbec8d4189890fdf3e71b32efae194e3
 F src/os_win.c 0fc0f46c94b0385a940b0ee32992a833019a5985
-F src/pager.c 5545863e4e246e1744cfb6993821c6e4b63ffb64
-F src/pager.h 6bea8d1949db33768de1c5b4133b267b40845f8b
+F src/pager.c 15d10371e2d560b68870a9ccec022ad8f01e70a2
+F src/pager.h 3f8c783de1d4706b40b1ac15b64f5f896bcc78d1
 F src/parse.y 12b7ebd61ea54f0e1b1083ff69cc2c8ce9353d58
 F src/pcache.c 49e718c095810c6b3334e3a6d89970aceaddefce
 F src/pcache.h c683390d50f856d4cd8e24342ae62027d1bb6050
@@ -963,7 +963,7 @@ F tool/symbols.sh caaf6ccc7300fd43353318b44524853e222557d5
 F tool/tostr.awk e75472c2f98dd76e06b8c9c1367f4ab07e122d06
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
 F tool/warnings.sh b7fdb2cc525f5ef4fa43c80e771636dd3690f9d2
-P 29c4d0dd43d41650e54824afd70dd40f1b91cc86
-R e9f251e9ab673855366d66b9e88d41ff
-U drh
-Z 203ac8ce95ad01a7dde042f0d58501cc
+P b31a7d7db9040d8eedaf1ecd89ea0033f579d0f1
+R 1c8ffe1a542693449ee741dcf7775b98
+U dan
+Z f53b7375cccfa7037a6a242074ab7937

diff --git a/manifest.uuid b/manifest.uuid
index 4995d7a8b0d10f4ef7aa21712d8617595c70f88e..6dbf91cefec5112319c5a9d1f6ef1e019f406cb9 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-b31a7d7db9040d8eedaf1ecd89ea0033f579d0f1
\ No newline at end of file
+69823ed163049d6fa1e24a9810c3c99f2a8fdd46
\ No newline at end of file

diff --git a/src/pager.c b/src/pager.c
index f40d2af74bf1428cf42a377e4af53a4e9cdd492e..f8d3ba998996213ff38c54b8c6261cc2813aa867 100644 (file)
--- a/src/pager.c
+++ b/src/pager.c
@@ -620,7 +620,6 @@ struct Pager {
   u8 tempFile;                /* zFilename is a temporary file */
   u8 readOnly;                /* True for a read-only database */
   u8 memDb;                   /* True to inhibit all file I/O */
-  u8 hasSeenStress;           /* pagerStress() called one or more times */
 
   /**************************************************************************
   ** The following block contains those class members that change during
@@ -4175,7 +4174,6 @@ static int pagerStress(void *p, PgHdr *pPg){
   ** be called in the error state.  Nevertheless, we include a NEVER()
   ** test for the error state as a safeguard against future changes.
   */
-  pPager->hasSeenStress = 1;
   if( NEVER(pPager->errCode) ) return SQLITE_OK;
   if( pPager->doNotSpill ) return SQLITE_OK;
   if( pPager->doNotSyncSpill && (pPg->flags & PGHDR_NEED_SYNC)!=0 ){

diff --git a/src/pager.h b/src/pager.h
index 2a02eff75cd65634d37357f61776e5dfa720f638..eab7ddaf80bb44c3a89c1b7123a8691be19b64fb 100644 (file)
--- a/src/pager.h
+++ b/src/pager.h
@@ -60,7 +60,6 @@ typedef struct PgHdr DbPage;
 #define PAGER_OMIT_JOURNAL  0x0001    /* Do not use a rollback journal */
 #define PAGER_NO_READLOCK   0x0002    /* Omit readlocks on readonly files */
 #define PAGER_MEMORY        0x0004    /* In-memory database */
-#define PAGER_SORTER        0x0020    /* Accumulator in external merge sort */
 
 /*
 ** Valid values for the second argument to sqlite3PagerLockingMode().