From: drh <drh@noemail.net>
Date: Fri, 26 Apr 2013 12:08:29 +0000 (+0000)
Subject: Reduce the default SQLITE_MAX_MMAP_SIZE slightly so that it fits in a
X-Git-Tag: version-3.7.17~51
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2bba8c249a154a3c8e38032169acfe29a3a5bf86;p=thirdparty%2Fsqlite.git

Reduce the default SQLITE_MAX_MMAP_SIZE slightly so that it fits in a
signed 32-bit integer.

FossilOrigin-Name: 460752b8575320163d2659bb7ff24aff41e2bb66
---

diff --git a/manifest b/manifest
index a3d9885853..41113c30a7 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Added\sthe\snextchar.c\sextension.\s\sMinor\schanges\sto\sthe\sspellfix.c\sextension\nso\sthat\sit\scan\sbe\sappended\sto\san\samalgamation\sand\scompiled\swithout\sduplicating\nsymbols.
-D 2013-04-25T19:31:33.149
+C Reduce\sthe\sdefault\sSQLITE_MAX_MMAP_SIZE\sslightly\sso\sthat\sit\sfits\sin\sa\nsigned\s32-bit\sinteger.
+D 2013-04-26T12:08:29.821
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in ce81671efd6223d19d4c8c6b88ac2c4134427111
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -196,7 +196,7 @@ F src/shell.c 5d527e5d08f05ec2c43ff194ea44bf62b974f4c9
 F src/sqlite.h.in ec279b782bea05db63b8b29481f9642b406004af
 F src/sqlite3.rc fea433eb0a59f4c9393c8e6d76a6e2596b1fe0c0
 F src/sqlite3ext.h d936f797812c28b81b26ed18345baf8db28a21a5
-F src/sqliteInt.h 3585ea1bb8776baa9f2675e9ef3d9170e7aeda29
+F src/sqliteInt.h de835c584032769461c123a564381f9808542c0e
 F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d
 F src/status.c bedc37ec1a6bb9399944024d63f4c769971955a9
 F src/table.c 2cd62736f845d82200acfa1287e33feb3c15d62e
@@ -1061,7 +1061,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 aabeea98f53edde68f484f1794ae70789dac3889
-R 77b136ceb7e3bfd54c75649b938a3e12
+P 56b9a417f5451631f11c5206d625f11472ee65f9
+R 83175c7cd0d9ce60e1daa5a05331eb65
 U drh
-Z fb4502a56cfa201ec6c890343c386675
+Z 44151e6d508d016989d25b422911b94b
diff --git a/manifest.uuid b/manifest.uuid
index 7c24934462..8936a5bdc4 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-56b9a417f5451631f11c5206d625f11472ee65f9
\ No newline at end of file
+460752b8575320163d2659bb7ff24aff41e2bb66
\ No newline at end of file
diff --git a/src/sqliteInt.h b/src/sqliteInt.h
index 876629a8c8..b041b3fb6e 100644
--- a/src/sqliteInt.h
+++ b/src/sqliteInt.h
@@ -563,7 +563,7 @@ extern const int sqlite3one;
   || defined(_WIN32) \
   || (defined(__APPLE__) && defined(__MACH__)) \
   || defined(__sun)
-#   define SQLITE_MAX_MMAP_SIZE 2147483648
+#   define SQLITE_MAX_MMAP_SIZE 0x7fff0000  /* 2147418112 */
 # else
 #   define SQLITE_MAX_MMAP_SIZE 0
 # endif