From: mistachkin <mistachkin@noemail.net>
Date: Mon, 25 Nov 2013 23:42:21 +0000 (+0000)
Subject: Add SQLITE_CONFIG_WIN32_HEAPSIZE option to configure the maximum isolated heap size... 
X-Git-Tag: version-3.8.2~41
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=202ca3e06ba0984b452fb9b41ff43a323f5d8ef7;p=thirdparty%2Fsqlite.git

Add SQLITE_CONFIG_WIN32_HEAPSIZE option to configure the maximum isolated heap size on Windows.

FossilOrigin-Name: 914e6c9d88828b66e8385c4a264702471faa34cf
---

202ca3e06ba0984b452fb9b41ff43a323f5d8ef7
diff --cc manifest
index f73f3143f4,3a3f1ec7e7..454254f66c
--- a/manifest
+++ b/manifest
@@@ -1,9 -1,9 +1,9 @@@
- C Change\sa\swhile-loop\sinto\sa\sdo-loop\sin\ssqlite3VdbeRecordCompare()\sand\sadd\nan\sassert()\sto\sverify\sthat\sthe\sdo-loop\sreally\sis\sappropriate.\s\sThis\sgives\nabout\sa\s10%\sperformance\sboost\sin\sthat\sroutine,\sor\sa\s0.9%\sboost\soverall.
- D 2013-11-25T22:24:36.845
 -C Clarify\sdocs\sfor\sthe\sSQLITE_CONFIG_WIN32_HEAPSIZE\soption.
 -D 2013-11-25T21:49:04.683
++C Add\sSQLITE_CONFIG_WIN32_HEAPSIZE\soption\sto\sconfigure\sthe\smaximum\sisolated\sheap\ssize\son\sWindows.
++D 2013-11-25T23:42:21.085
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 -F Makefile.in 8a07bebafbfda0eb67728f4bd15a36201662d1a1
 +F Makefile.in e1a9b4258bbde53f5636f4e238c65b7e11459e2b
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
 -F Makefile.msc 19243469fcd1073319ea5b7db97609c1cfb3b1c0
 +F Makefile.msc a6247094079f3ef97dcd7a69d0e13ff718c7073e
  F Makefile.vxworks db21ed42a01d5740e656b16f92cb5d8d5e5dd315
  F README cd04a36fbc7ea56932a4052d7d0b7f09f27c33d6
  F VERSION 52f7e22bfcec71a462e34194b4ae1671380fde59
@@@ -221,7 -221,7 +221,7 @@@ F src/resolve.c a70e32ae6ccb7b780f2b6d3
  F src/rowset.c 64655f1a627c9c212d9ab497899e7424a34222e0
  F src/select.c d41381d80a22d3a83352aeca274cccf264ac277a
  F src/shell.c c4d06a9238a515ff4bc86b8626139633c09a00a2
- F src/sqlite.h.in a5dc058a909d9f14470bad9329d9e9303020ea4e
 -F src/sqlite.h.in a63edec76cca981ce859b5cfa4776121b7a113e5
++F src/sqlite.h.in a8328969be639b6cd8d9225ed2a51d9d624fff5f
  F src/sqlite3.rc 11094cc6a157a028b301a9f06b3d03089ea37c3e
  F src/sqlite3ext.h 886f5a34de171002ad46fae8c36a7d8051c190fc
  F src/sqliteInt.h 9d586cb37572cd9e0a48242d449c6a69c2e74e72
@@@ -1142,7 -1142,7 +1143,7 @@@ F tool/vdbe-compress.tcl f12c884766bd14
  F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
  F tool/warnings.sh d1a6de74685f360ab718efda6265994b99bbea01
  F tool/win/sqlite.vsix 030f3eeaf2cb811a3692ab9c14d021a75ce41fff
- P 18bdcb05c26860643f53a6b9e85f84109a3ebe5a
- R dac23119194b70834a8988d5969d30b0
- U drh
- Z 2ee808e2592f93c91c4a4d0443aab097
 -P f09f11e94b5a7c2e51d99c3700d2acd2f3903de9
 -R 27fb3c9a311fe5f2bbe8062f9b160f8d
++P 011a6be439eb884c944a3318bf631bed3135f8ec 51e876074af4e34ba01ed122e3bcc042243c9e88
++R a48ce81d597ca35b28409062489bab18
+ U mistachkin
 -Z d9c5f17d385924b0a9e66e3497c49033
++Z d1bf9d184524adde89c6b90b5f2f5190
diff --cc manifest.uuid
index dec077a3f4,e16a6221c7..aea642c3cd
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 011a6be439eb884c944a3318bf631bed3135f8ec
 -51e876074af4e34ba01ed122e3bcc042243c9e88
++914e6c9d88828b66e8385c4a264702471faa34cf
diff --cc src/sqlite.h.in
index e6dcfaba9a,ca5972bfcf..f5565cf210
--- a/src/sqlite.h.in
+++ b/src/sqlite.h.in
@@@ -1682,6 -1682,13 +1682,13 @@@ struct sqlite3_mem_methods 
  ** [SQLITE_MAX_MMAP_SIZE] compile-time option.)^
  ** ^If either argument to this option is negative, then that argument is
  ** changed to its compile-time default.
+ **
+ ** [[SQLITE_CONFIG_WIN32_HEAPSIZE]]
+ ** <dt>SQLITE_CONFIG_WIN32_HEAPSIZE
+ ** <dd>^This option is only available if SQLite is compiled for Windows
+ ** with the [SQLITE_WIN32_MALLOC] pre-processor macro defined.
+ ** SQLITE_CONFIG_WIN32_HEAPSIZE takes a 32-bit unsigned integer value
 -** that specifies the maximum size of the heap.
++** that specifies the maximum size of the created heap.
  ** </dl>
  */
  #define SQLITE_CONFIG_SINGLETHREAD  1  /* nil */