Version 3.7.12

FossilOrigin-Name: d9348b2a4e15873756adfd092e8128d9f1cf72b4

diff --cc manifest
index 5d0b41888fa624562def62c6c45727d9c511a461,1f29b07d69882d1c3d15ed4ae74fb7b049ed0b83..4d25672661eee09e774e1ffa0cc2302c5bd9fd17
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,7 -1,7 +1,7 @@@
- C Merge\strunk\schanges\swith\sapple-osx\sbranch.
- D 2012-05-12T14:59:45.219
+ C Version\s3.7.12
 -D 2012-05-14T01:41:23.304
++D 2012-05-14T02:05:15.770
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 -F Makefile.in 2f37e468503dbe79d35c9f6dffcf3fae1ae9ec20
 +F Makefile.in 957c9693400fca6cb8b533b589e69ddee7bcb27c
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
  F Makefile.msc 7849a871b6cdb20fd51baee6bbe5965a03326be4
  F Makefile.vxworks 3b7fe7a0571fdadc61363ebc1b23732d2d6363ca
@@@ -162,11 -159,11 +162,11 @@@ F src/os.c 4c8c8d72a6c58ad2fde4865783e8
  F src/os.h 59beba555b65a450bd1d804220532971d4299f60
  F src/os_common.h 92815ed65f805560b66166e3583470ff94478f04
  F src/os_os2.c 4a75888ba3dfc820ad5e8177025972d74d7f2440
 -F src/os_unix.c 424d46e0edab969293c2223f09923b2178171f47
 -F src/os_win.c 412d6434133c7c81dc48b7702f3ea5e61c309e5c
 -F src/pager.c bb5635dde0b152797836d1c72275284724bb563c
 -F src/pager.h ef1eaf8593e78f73885c1dfac27ad83bee23bdc5
 +F src/os_unix.c f8c943a0f9c4e2e7fae9facb3a243cb58cc8ceb5
 +F src/os_win.c 24b57b4aec07ec78ae759244ab6d9759a70fe29b
 +F src/pager.c 544cc84d50fea0ca921d448037b217ecabba359b
 +F src/pager.h 42926ac0fe69e9d7e17a54e6b37417e581a429d7
- F src/parse.y de06f412a4b3a2978071215f657fd1cd70700444
+ F src/parse.y f29df90bd3adc64b33114ab1de9fb7768fcf2099
  F src/pcache.c f8043b433a57aba85384a531e3937a804432a346
  F src/pcache.h 1b5dcc3dc8103d03e625b177023ee67764fa6b7c
  F src/pcache1.c b30b1c35908346ecc43d8d9d17f2ddf6817f8f60
@@@ -176,12 -173,11 +176,12 @@@ F src/printf.c 7ffb4ebb8b341f67e049695b
  F src/random.c cd4a67b3953b88019f8cd4ccd81394a8ddfaba50
  F src/resolve.c 748e75299faff345f34f0e5bd02a2bac8aa69fcd
  F src/rowset.c f6a49f3e9579428024662f6e2931832511f831a1
 -F src/select.c d7b9018b7dd2e821183d69477ab55c39b8272335
 +F src/select.c cf2f8f771bab6417e51a0f17b086a87bb74d624c
  F src/shell.c 04399b2f9942bd02ed5ffee3b84bcdb39c52a1e6
- F src/sqlite.h.in d9b3c24cd5e2cbe160bf8f9a8a01e3d2cbcbc631
 -F src/sqlite.h.in 4f4d4792f6fb00387c877af013cb09d955643f12
++F src/sqlite.h.in 192eb22f3f217c00ff48a8da356a8a020f6b4a8e
 +F src/sqlite3_private.h 97a1e15b3a078bb583622da01a2e9bc96c6edf14
  F src/sqlite3ext.h 6904f4aadf976f95241311fbffb00823075d9477
 -F src/sqliteInt.h c5e917c4f1453f3972b1fd0c81105dfe4f09cc32
 +F src/sqliteInt.h ec90f0d797bbc93dd849629f18513b57bfd9a787
  F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d
  F src/status.c 35939e7e03abf1b7577ce311f48f682c40de3208
  F src/table.c 2cd62736f845d82200acfa1287e33feb3c15d62e
@@@ -1002,7 -997,10 +1002,7 @@@ F tool/tostr.awk e75472c2f98dd76e06b8c9
  F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
  F tool/warnings-clang.sh a8a0a3babda96dfb1ff51adda3cbbf3dfb7266c2
  F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
- P 66708685909fb048edab7f15e4a81d5a554d88d9 f84d87bcc0e4f6f56d01556b2b1dc27ebef9ce26
- R 98d3ac84a2d85402687ea4fe3a44e77d
- U dan
- Z 7e01eaeda0cc16cdaaff0ca05577b01d
 -P af525b5d25b5dee20528acc8321b8c6ca9aa98ae
 -R 25bb989b178d8b31e0e59b449786abed
 -T +bgcolor * #d0c0ff
 -T +sym-release *
 -T +sym-version-3.7.12 *
++P bf57f0fb73500f384fc57cbe2501343c97dc433e 8654aa9540fe9fd210899d83d17f3f407096c004
++R 12b92e18e3ce253aa9f29c615d138e39
+ U drh
 -Z 093fff96464341c2fff7d3363f677b3a
++Z f2b43ef80e7018715193d790be637b9b

diff --cc manifest.uuid
index 986b53681e23378b2f6f9c95bd691eb36c8901e3,f4728f553f802627655a56963c9758b86d0e455b..a8d2839d7f06fe0dd77f2f16e4d545ef84c17bd7
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- bf57f0fb73500f384fc57cbe2501343c97dc433e
 -8654aa9540fe9fd210899d83d17f3f407096c004
++d9348b2a4e15873756adfd092e8128d9f1cf72b4

diff --cc src/sqlite.h.in
Simple merge