From: drh <drh@noemail.net>
Date: Wed, 3 Apr 2013 10:50:02 +0000 (+0000)
Subject: Initialize the mmap_limit of temporary files to the configured mmap_limit.
X-Git-Tag: version-3.7.17~114^2~7
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2b8246e3e23cb98b6d7339de019d446aa3bc3bb8;p=thirdparty%2Fsqlite.git

Initialize the mmap_limit of temporary files to the configured mmap_limit.

FossilOrigin-Name: 24bab7596bb7385981a5d331df5eeb05353547f7
---

diff --git a/manifest b/manifest
index cbde44af45..78b0bffaa7 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Make\suse\sof\sxFetch,\sif\sit\sis\savailable\swhen\sdoing\sa\sVACUUM\sor\sa\sbackup.
-D 2013-04-03T03:53:15.647
+C Initialize\sthe\smmap_limit\sof\stemporary\sfiles\sto\sthe\sconfigured\smmap_limit.
+D 2013-04-03T10:50:02.049
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in df3e48659d80e1b7765785d8d66c86b320f72cc7
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -160,8 +160,8 @@ F src/notify.c 976dd0f6171d4588e89e874fcc765e92914b6d30
 F src/os.c 809d0707cec693e1b9b376ab229271ad74c3d35d
 F src/os.h ae08bcc5f6ec6b339f4a2adf3931bb88cc14c3e4
 F src/os_common.h 92815ed65f805560b66166e3583470ff94478f04
-F src/os_unix.c f7d8c6ef5f45111f62a77984053c17e767f9679e
-F src/os_win.c 6a7a1017fb6a0783a3aa7c3f5eadd9b1600a9ddf
+F src/os_unix.c 626ddccfd5b1be0c91ca5a9d147c8c3e824d7013
+F src/os_win.c 6718b053fe8295ede770b7a1e48ba4ef73310e9c
 F src/pager.c e26184d451207542d56bd09b84339252a194791e
 F src/pager.h 5cb78b8e1adfd5451e600be7719f5a99d87ac3b1
 F src/parse.y 5d5e12772845805fdfeb889163516b84fbb9ae95
@@ -1042,7 +1042,7 @@ F tool/vdbe-compress.tcl f12c884766bd14277f4fcedcae07078011717381
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
 F tool/win/sqlite.vsix 97894c2790eda7b5bce3cc79cb2a8ec2fde9b3ac
-P fc30d06c94c8212abb0477fb4cec4520d05bea34
-R 8f21f6233365f9239c040421dd942d16
+P 83bc37af07857960c11275891f853a358dcbbf05
+R 32aa00c0c8e64a488f9b37d8aa36924f
 U drh
-Z fab31801d3b721c34a1407901bd055e3
+Z db8bee74489339af40a69aa3740a7e67
diff --git a/manifest.uuid b/manifest.uuid
index 847cb431dc..56b76309a3 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-83bc37af07857960c11275891f853a358dcbbf05
\ No newline at end of file
+24bab7596bb7385981a5d331df5eeb05353547f7
\ No newline at end of file
diff --git a/src/os_unix.c b/src/os_unix.c
index 6ca99fa532..39a31cb188 100644
--- a/src/os_unix.c
+++ b/src/os_unix.c
@@ -5060,7 +5060,7 @@ static int fillInUnixFile(
   pNew->pVfs = pVfs;
   pNew->zPath = zFilename;
   pNew->ctrlFlags = (u8)ctrlFlags;
-  pNew->mmapLimit = SQLITE_DEFAULT_MMAP_LIMIT;
+  pNew->mmapLimit = sqlite3GlobalConfig.mxMmap;
   if( sqlite3_uri_boolean(((ctrlFlags & UNIXFILE_URI) ? zFilename : 0),
                            "psow", SQLITE_POWERSAFE_OVERWRITE) ){
     pNew->ctrlFlags |= UNIXFILE_PSOW;
diff --git a/src/os_win.c b/src/os_win.c
index a978613e2e..74aede5704 100644
--- a/src/os_win.c
+++ b/src/os_win.c
@@ -4116,7 +4116,7 @@ static int winOpen(
   pFile->pMapRegion = 0;
   pFile->mmapSize = 0;
   pFile->mmapOrigsize = 0;
-  pFile->mmapLimit = SQLITE_DEFAULT_MMAP_LIMIT;
+  pFile->mmapLimit = sqlite3GlobalConfig.mxMmap;
 
   OpenCounter(+1);
   return rc;