From: drh <drh@noemail.net>
Date: Mon, 2 Dec 2013 21:58:19 +0000 (+0000)
Subject: Merge all recent 3.8.2 beta changes from trunk.
X-Git-Tag: version-3.13.0~148^2~168
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=52208a6332d682403aafd65bdce186257eb7d507;p=thirdparty%2Fsqlite.git

Merge all recent 3.8.2 beta changes from trunk.

FossilOrigin-Name: 67c34ccfa9596a923695dc4994ec87b331f8326c
---

52208a6332d682403aafd65bdce186257eb7d507
diff --cc manifest
index ee7e6c8dc2,baeef82ada..f1f7cfa2b7
--- a/manifest
+++ b/manifest
@@@ -1,9 -1,9 +1,9 @@@
- C Merge\sall\srecent\strunk\schanges.
- D 2013-11-27T21:53:51.759
 -C Another\s#if\sSQLITE_VERSION_NUMBER\smacro\sin\sspeedtest1.c\sfor\scompatibility\nwith\solder\sversions\sof\sSQLite.
 -D 2013-12-02T21:25:40.013
++C Merge\sall\srecent\s3.8.2\sbeta\schanges\sfrom\strunk.
++D 2013-12-02T21:58:19.732
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 -F Makefile.in e1a9b4258bbde53f5636f4e238c65b7e11459e2b
 +F Makefile.in 06b851f767034811d4f6e159367c453dc28d3925
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
 -F Makefile.msc a6247094079f3ef97dcd7a69d0e13ff718c7073e
 +F Makefile.msc da7f2a230af6e39b71b2706dbb4c35fff7222a0f
  F Makefile.vxworks db21ed42a01d5740e656b16f92cb5d8d5e5dd315
  F README cd04a36fbc7ea56932a4052d7d0b7f09f27c33d6
  F VERSION 52f7e22bfcec71a462e34194b4ae1671380fde59
@@@ -202,7 -188,7 +202,7 @@@ F src/journal.c b4124532212b6952f42eb2c
  F src/legacy.c 0df0b1550b9cc1f58229644735e317ac89131f12
  F src/lempar.c cdf0a000315332fc9b50b62f3b5e22e080a0952b
  F src/loadext.c 867c7b330b740c6c917af9956b13b81d0a048303
- F src/main.c ce3f0087c9976bed2c8955ad55f99353f0cdc8fb
 -F src/main.c 74bdee8f574588868e67c25cd377df7cba80102e
++F src/main.c f432ac8a820b4b9fbfd41c40c686f8d971791abe
  F src/malloc.c 543a8eb5508eaf4cadf55a9b503379eba2088128
  F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
  F src/mem1.c c0c990fcaddff810ea277b4fb5d9138603dd5d4b
@@@ -235,15 -221,15 +235,15 @@@ F src/resolve.c 7eda9097b29fcf3d2b42fdc
  F src/rowset.c 64655f1a627c9c212d9ab497899e7424a34222e0
  F src/select.c d41381d80a22d3a83352aeca274cccf264ac277a
  F src/shell.c 936a72ff784efff3832cce274a96ed0b036e6758
- F src/sqlite.h.in e7a96fad3f5a2e96f5b69cf395d3dfa657f4ab59
 -F src/sqlite.h.in baf55c31c4e15a4b626acfeaa792f2aaa566657f
++F src/sqlite.h.in afb55228e32532456938c5c4ac0b9aa0828f3677
  F src/sqlite3.rc 11094cc6a157a028b301a9f06b3d03089ea37c3e
  F src/sqlite3ext.h 886f5a34de171002ad46fae8c36a7d8051c190fc
- F src/sqliteInt.h dad3dff932c055304fc75b339f2cf68aab9cf19e
 -F src/sqliteInt.h f3a5d663fe9c6c0b2ee7fc2e20a6204eaea5bc7c
++F src/sqliteInt.h f4056513ed1a1690f1ff0ec6df15b38581676f2f
  F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d
  F src/status.c 7ac05a5c7017d0b9f0b4bcd701228b784f987158
  F src/table.c 2cd62736f845d82200acfa1287e33feb3c15d62e
 -F src/tclsqlite.c 651b10698c87bbc3ae5772e2491e3444c5bbf153
 +F src/tclsqlite.c 758fa6b6cfd39330db8b71b1f94e46f03ef375b8
- F src/test1.c 5757066e503a8ed51313cb3a5d9bcdcced2991a9
+ F src/test1.c 760e0419705f712d80595f47199568cd7e3b57a4
  F src/test2.c 7355101c085304b90024f2261e056cdff13c6c35
  F src/test3.c 1c0e5d6f080b8e33c1ce8b3078e7013fdbcd560c
  F src/test4.c 9b32d22f5f150abe23c1830e2057c4037c45b3df
@@@ -290,16 -276,16 +290,16 @@@ F src/test_vfstrace.c 34b544e80ba7fb77b
  F src/test_wsd.c 41cadfd9d97fe8e3e4e44f61a4a8ccd6f7ca8fe9
  F src/tokenize.c ec4c1a62b890bf1dbcdb966399e140b904c700a4
  F src/trigger.c d84e1f3669e9a217731a14a9d472b1c7b87c87ba
 -F src/update.c c05a0ee658f1a149e0960dfd110f3b8bd846bcb0
 +F src/update.c 046d7df2a4b3d85442a758f484eb2d40a48b5465
  F src/utf.c 6fc6c88d50448c469c5c196acf21617a24f90269
- F src/util.c cbe054290f780fcd472b89d701c7404c51ec9684
+ F src/util.c c1d47254d805074226eb68bab2327f2559799d88
  F src/vacuum.c 3728d74919d4fb1356f9e9a13e27773db60b7179
 -F src/vdbe.c 54894fde8dc806d259e015ac7c9680145e725835
 -F src/vdbe.h c06f0813f853566457ce9cfb1a4a4bc39a5da644
 -F src/vdbeInt.h 05fbda0e061dbc4aaa2709a8cccf3515c245b263
 -F src/vdbeapi.c 93a22a9ba2abe292d5c2cf304d7eb2e894dde0ed
 -F src/vdbeaux.c 5b58b242afe50f6bae77da1c1e26330af32e51c7
 -F src/vdbeblob.c 8cd05a5630e6d5563ad017bf82edaf812b28acde
 +F src/vdbe.c 9c6fb9ed1b9165427b0fdc812bc9c48c031f77da
 +F src/vdbe.h b7bfa7b468fcad2cf1890969fe7459325da00385
 +F src/vdbeInt.h 1a5c604f33a5d46c839fee0cab16743aa3e1bc2e
 +F src/vdbeapi.c e80d6d9dea792bd823cb64ae05cba446a7b3556a
- F src/vdbeaux.c 9270db4725c0143e572a2df660fabac7104a9db3
++F src/vdbeaux.c aad7d1714be08e05999a92f366328173286ecaac
 +F src/vdbeblob.c a2809461743e0b9dd9be871149ac65e8d2c80c08
  F src/vdbemem.c af650c2019dc197f062440cdb4650b7204e648bf
  F src/vdbesort.c 9d83601f9d6243fe70dd0169a2820c5ddfd48147
  F src/vdbetrace.c e7ec40e1999ff3c6414424365d5941178966dcbc
@@@ -482,9 -468,9 +482,9 @@@ F test/fkey2.test 32ca728bcb854feed72d1
  F test/fkey3.test 76d475c80b84ee7a5d062e56ccb6ea68882e2b49
  F test/fkey4.test 86446017011273aad8f9a99c1a65019e7bd9ca9d
  F test/fkey5.test 8a1fde4e7721ae00b05b3178888833726ca2df8d
 -F test/fkey6.test abb59f866c1b44926fd02d1fdd217d831fe04f48
 +F test/fkey6.test 6697550baa38505c9952eff130ab26a2d156c0cc
  F test/fkey7.test e31d0e71a41c1d29349a16448d6c420e2c53a8fc
- F test/fkey_malloc.test bb74c9cb8f8fceed03b58f8a7ef2df98520bbd51
+ F test/fkey_malloc.test 594a7ea1fbab553c036c70813cd8bd9407d63749
  F test/format4.test 1f0cac8ff3895e9359ed87e41aaabee982a812eb
  F test/fts-9fd058691.test 78b887e30ae6816df0e1fed6259de4b5a64ad33c
  F test/fts1a.test 46090311f85da51bb33bd5ce84f7948359c6d8d7
@@@ -851,11 -836,11 +851,11 @@@ F test/sysfault.test fa776e60bf46bdd3ae
  F test/table.test 580d23530187026d4502fae74a490f0408cf2cc7
  F test/tableapi.test 2674633fa95d80da917571ebdd759a14d9819126
  F test/tableopts.test dba698ba97251017b7c80d738c198d39ab747930
 -F test/tclsqlite.test 37a61c2da7e3bfe3b8c1a2867199f6b860df5d43
 +F test/tclsqlite.test a7308276aad2e6c0bfb5b0414424dd0d9cc0cad7
  F test/tempdb.test 19d0f66e2e3eeffd68661a11c83ba5e6ace9128c
  F test/temptable.test d2c9b87a54147161bcd1822e30c1d1cd891e5b30
- F test/temptrigger.test 0a48d94222d50e6e50d72ac103606c4f8e7cbb81
- F test/tester.tcl a0f63e910f954acd367a5951e3a4f3ef9c32067a
+ F test/temptrigger.test 8ec228b0db5d7ebc4ee9b458fc28cb9e7873f5e1
 -F test/tester.tcl 2a7cce4abf404557c09323a84a2444b189835d0f
++F test/tester.tcl f1316f88470a06db624fae39d5279ce21ed49652
  F test/thread001.test 9f22fd3525a307ff42a326b6bc7b0465be1745a5
  F test/thread002.test e630504f8a06c00bf8bbe68528774dd96aeb2e58
  F test/thread003.test ee4c9efc3b86a6a2767516a37bd64251272560a7
@@@ -1160,7 -1145,7 +1160,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 fc9ae839569eb28eb734c52d95676c59b2e27494 81891288d9f281cf2ceb4cd701c0c3231b1bab19
- R 82cfa20fdf0a662273b8437808c19755
 -P 4b20cf4206ac12975ca9c4ec7ef76aa21bbd734d
 -R fc7264469bd7eed8b2c47bd423fccf15
++P 3a2a1bd47875e114d8e6f31c1768908f401d2861 bc8eacc7f71413184ef5be1412e51f8fd7174cd1
++R 23fdb9bec4ca7fb51a8c2b5b5649fa63
  U drh
- Z 5ce6e39b92ce4cf1a9fbbd5b784d1d3b
 -Z f0389d08b87706a34ccfa173cc3d5e77
++Z d6ca9769225d05465b3da41409f1cf6b
diff --cc manifest.uuid
index b00a655abf,c2586c5739..b7ae0d856a
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 3a2a1bd47875e114d8e6f31c1768908f401d2861
 -bc8eacc7f71413184ef5be1412e51f8fd7174cd1
++67c34ccfa9596a923695dc4994ec87b331f8326c