From: drh <drh@noemail.net>
Date: Thu, 14 Aug 2014 14:02:48 +0000 (+0000)
Subject: Merge the pre-3.8.6 changes into the threads branch.
X-Git-Tag: version-3.8.7~132^2~9
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=83b25d32d7ca274011455f1e5a9db2db1c49f8e9;p=thirdparty%2Fsqlite.git

Merge the pre-3.8.6 changes into the threads branch.

FossilOrigin-Name: a608fd1d52606a009c3acc7f1d184b86a7df3c82
---

83b25d32d7ca274011455f1e5a9db2db1c49f8e9
diff --cc manifest
index 31ec92e82f,a9e401b96b..f5f51417e8
--- a/manifest
+++ b/manifest
@@@ -1,9 -1,9 +1,9 @@@
- C Merge\sall\srecent\schanges\sfrom\strunk.
- D 2014-08-06T02:03:35.291
 -C Fix\stypos\sin\scomments\sused\sto\shelp\sgenerate\sdocumentation.\s\sNo\schanges\sto\scode.
 -D 2014-08-14T13:06:25.245
++C Merge\sthe\spre-3.8.6\schanges\sinto\sthe\sthreads\sbranch.
++D 2014-08-14T14:02:48.852
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 -F Makefile.in 5eb79e334a5de69c87740edd56af6527dd219308
 +F Makefile.in cf57f673d77606ab0f2d9627ca52a9ba1464146a
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
 -F Makefile.msc 5b04e657cf08a9ac7fc47d876c5c8be962c47d6b
 +F Makefile.msc e31dee24038965fb6269d6d61073fd6b7e331dec
  F Makefile.vxworks 034289efa9d591b04b1a73598623119c306cbba0
  F README.md 64f270c43c38c46de749e419c22f0ae2f4499fe8
  F VERSION 1c877615a9db323e3cd301e3d57d853f9d5c4a07
@@@ -179,17 -179,17 +179,17 @@@ F src/delete.c bcf8f72126cea80fc3d5bc54
  F src/expr.c f749009cf4a8534efb5e0d5cd7c9fb1fb0f2836c
  F src/fault.c 160a0c015b6c2629d3899ed2daf63d75754a32bb
  F src/fkey.c 8545f3b36da47473e10800ea4fb0810fd4062514
- F src/func.c 3bc223ea36cd29a91c481485343d0ee4257ab8dc
+ F src/func.c bbb724b74ed96ca42675a7274646a71dd52bcda7
 -F src/global.c 1e4bd956dc2f608f87d2a929abc4a20db65f30e4
 +F src/global.c 77ec119d6f6453039c2820336af8e8f804f20acf
  F src/hash.c d139319967164f139c8d1bb8a11b14db9c4ba3cd
  F src/hash.h 8890a25af81fb85a9ad7790d32eedab4b994da22
  F src/hwtime.h d32741c8f4df852c7d959236615444e2b1063b08
  F src/insert.c 991e4964e9295da3993e2c0f81c7faf642371848
  F src/journal.c b4124532212b6952f42eb2c12fa3c25701d8ba8d
- F src/legacy.c 0df0b1550b9cc1f58229644735e317ac89131f12
+ F src/legacy.c febc2a9e7ad6c1a6191c7b5b9170b325d263f343
  F src/lempar.c cdf0a000315332fc9b50b62f3b5e22e080a0952b
  F src/loadext.c 867c7b330b740c6c917af9956b13b81d0a048303
- F src/main.c 42ba5977d1c4324620b2ef2bc05b7bb28a2331e4
 -F src/main.c 1cf92c5c6468f2b6ed99b638706781ccc9c60b42
++F src/main.c 333a7134a4e08f7660c4e52390eda99c49493ba6
  F src/malloc.c 0203ebce9152c6a0e5de520140b8ba65187350be
  F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
  F src/mem1.c c0c990fcaddff810ea277b4fb5d9138603dd5d4b
@@@ -207,8 -207,8 +207,8 @@@ F src/os.c 1b147e4cf7cc39e618115c14a086
  F src/os.h 60d419395e32a8029fa380a80a3da2e9030f635e
  F src/os_common.h 92815ed65f805560b66166e3583470ff94478f04
  F src/os_setup.h c9d4553b5aaa6f73391448b265b89bed0b890faa
- F src/os_unix.c a7baf1b30f3c58ba20b813e01aab23b18ae44f85
- F src/os_win.c 9a7fda788394109131677a9fceee8d54820b6c16
+ F src/os_unix.c bd7df3094a60915c148517504c76df4fca24e542
 -F src/os_win.c 1c936c7b0659d0eb12b868e2cd710a570e78873e
++F src/os_win.c 058cefbeb0f9713b7cc161c6d09e5a1770d26e11
  F src/os_win.h 057344a6720b4c8405d9bd98f58cb37a6ee46c25
  F src/pager.c f6bb1fa6cdf2062f2d8aec3e64db302bca519ab8
  F src/pager.h ffd5607f7b3e4590b415b007a4382f693334d428
@@@ -220,14 -220,14 +220,14 @@@ F src/pragma.c d10ef67c4de79f78188b965b
  F src/prepare.c 677521ab7132615a8a26107a1d1c3132f44ae337
  F src/printf.c af06f66927919730f03479fed6ae9854f73419f4
  F src/random.c d10c1f85b6709ca97278428fd5db5bbb9c74eece
- F src/resolve.c 5fc110baeacf120a73fe34e103f052632ff11a02
+ F src/resolve.c 0ea356d32a5e884add23d1b9b4e8736681dd5697
  F src/rowset.c a9c9aae3234b44a6d7c6f5a3cadf90dce1e627be
- F src/select.c c28f5165280ea7214285e4c53a23b257e1a06127
- F src/shell.c 05e9e7f667a6340643b647c4be0db15dd7627d92
- F src/sqlite.h.in 44b761ddf5362581617d08457f11ee582eb103a2
- F src/sqlite3.rc 11094cc6a157a028b301a9f06b3d03089ea37c3e
 -F src/select.c ea48e891406ccdf748f3eb02893e056d134a0fea
 -F src/shell.c 75bb7bd2c80bb44861598f322a417c4bafe98fd7
 -F src/sqlite.h.in ed9d35990c61f0388ca6405706455c4095310553
++F src/select.c f8b0b6c43bee15f4e239ead1c9c9e3009e507e39
++F src/shell.c 26f8ef7f52b26644bb9098c62cee8694c17b3259
++F src/sqlite.h.in fef15a64d1358f5c365bd3f46f4c1915d5a5e5f0
+ F src/sqlite3.rc 992c9f5fb8285ae285d6be28240a7e8d3a7f2bad
  F src/sqlite3ext.h 886f5a34de171002ad46fae8c36a7d8051c190fc
 -F src/sqliteInt.h 641f8fbb65ca2084c8df95b525f6f82c7a1e91ae
 +F src/sqliteInt.h b500ee46173fb510f8e10891a58bbf8e657bb3e6
  F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d
  F src/status.c 7ac05a5c7017d0b9f0b4bcd701228b784f987158
  F src/table.c 2cd62736f845d82200acfa1287e33feb3c15d62e
@@@ -284,14 -283,14 +284,14 @@@ F src/update.c ea336ce7b8b3fc5e316ba8f0
  F src/utf.c a0314e637768a030e6e84a957d0c4f6ba910cc05
  F src/util.c 3076bdd51cdbf60a6e2e57fada745be37133c73e
  F src/vacuum.c 3728d74919d4fb1356f9e9a13e27773db60b7179
- F src/vdbe.c 787d1b5178abaf44600702f6976a927d79ce3a92
 -F src/vdbe.c f7f4066e4d6e3858878d76ce9288ea603e12ddf6
++F src/vdbe.c aae4addde348f8a8d94a907f41c4524b7e2e0529
  F src/vdbe.h c63fad052c9e7388d551e556e119c0bcf6bebdf8
 -F src/vdbeInt.h f5513f2b5ac1e2c5128996c7ea23add256a301df
 +F src/vdbeInt.h 8870adf012235708f125f8cd1c988f487dc3eb6f
  F src/vdbeapi.c 24e40422382beb774daab11fe9fe9d37e8a04949
- F src/vdbeaux.c 3f1d2baa4a8cbdad33cb255a5f4fd1af7a414683
 -F src/vdbeaux.c 25d62ef82cf1be2a1255eacac636fa0d943d8b3d
++F src/vdbeaux.c 142fdb31f6423fb3c66a7b0687dbf894a259b1cf
  F src/vdbeblob.c 9205ce9d3b064d9600f8418a897fc88b5687d9ac
  F src/vdbemem.c d90a1e8acf8b63dc9d14cbbea12bfec6cec31394
 -F src/vdbesort.c f7f5563bf7d4695ca8f3203f3bf9de96d04ed0b3
 +F src/vdbesort.c b9a830685826c057cfd41993902a5afc6fe436e1
  F src/vdbetrace.c 6f52bc0c51e144b7efdcfb2a8f771167a8816767
  F src/vtab.c 21b932841e51ebd7d075e2d0ad1415dce8d2d5fd
  F src/wal.c 264df50a1b33124130b23180ded2e2c5663c652a
@@@ -677,7 -676,7 +677,7 @@@ F test/lock_common.tcl 0c270b121d40959f
  F test/lookaside.test 93f07bac140c5bb1d49f3892d2684decafdc7af2
  F test/main.test 39c4bb8a157f57298ed1659d6df89d9f35aaf2c8
  F test/make-where7.tcl 05c16b5d4f5d6512881dfec560cb793915932ef9
- F test/malloc.test ada8ae15193ffc6415bf431a6db31d4ec507dbfe
 -F test/malloc.test 4eb83876dfe4915766c179b687b8640437f14abf
++F test/malloc.test 96939d2d1a6f39667bbebe5bc27c6525f2ab614e
  F test/malloc3.test e3b32c724b5a124b57cb0ed177f675249ad0c66a
  F test/malloc4.test 957337613002b7058a85116493a262f679f3a261
  F test/malloc5.test fafce0aa9157060445cd1a56ad50fc79d82f28c3
@@@ -1190,7 -1186,7 +1191,7 @@@ F tool/vdbe_profile.tcl 67746953071a9f8
  F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
  F tool/warnings.sh 0abfd78ceb09b7f7c27c688c8e3fe93268a13b32
  F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
- P 655d8cfc752b3f5f63521a57f2155f8e14aaf7c4 717245d48714c08156c9b7636aaa6c3a402bad66
- R 522f9cbdadcee03fc45f476dbd20c9a7
 -P f5cce9db109a2bbe9a05b4c01b076a51d5fad8ba
 -R b4842944a4c3679f5b3af787e9b322df
++P a353a8515fb2eff86042d0c33e39772f4d04e0b3 13a2d90a2869c53b79754de39045bbbdbc7688e3
++R 64b417b620c9f6c58aeb23fe611b07d3
  U drh
- Z 56e08fa149f3ad8b1a6753df47adb03f
 -Z 52db703ea373cd617fd2c598672c0ab8
++Z b2ed58163bf8c58a60958e9dca71f3dd
diff --cc manifest.uuid
index a7eb49c40e,5d1e011162..dbdc61eb7e
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- a353a8515fb2eff86042d0c33e39772f4d04e0b3
 -13a2d90a2869c53b79754de39045bbbdbc7688e3
++a608fd1d52606a009c3acc7f1d184b86a7df3c82