From: drh <drh@noemail.net>
Date: Mon, 28 Oct 2013 22:47:24 +0000 (+0000)
Subject: Merge all trunk changes since 3.8.1 into the sessions branch.
X-Git-Tag: version-3.13.0~148^2~175
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d63d4b7bd7a5c84972dd16524610782fe301556c;p=thirdparty%2Fsqlite.git

Merge all trunk changes since 3.8.1 into the sessions branch.

FossilOrigin-Name: aa72ea8a004de7fe744fc13baef19d05aea607d5
---

d63d4b7bd7a5c84972dd16524610782fe301556c
diff --cc manifest
index 96b69c3e47,f66ec4132d..4112e0a47f
--- a/manifest
+++ b/manifest
@@@ -1,9 -1,9 +1,9 @@@
- C Merge\sthe\slatest\strunk\schanges.
- D 2013-10-16T14:32:47.098
 -C Formatting\simprovements\sto\sthe\sWHERE-clause\sconstraint\sdisplay\sin\sthe\nwheretrace\sdebugging\slogic.
 -D 2013-10-28T22:33:36.558
++C Merge\sall\strunk\schanges\ssince\s3.8.1\sinto\sthe\ssessions\sbranch.
++D 2013-10-28T22:47:24.844
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 -F Makefile.in 0522b53cdc1fcfc18f3a98e0246add129136c654
 +F Makefile.in 15f75d6d804c5552a05390d1982c1114b8ce6d2d
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
 -F Makefile.msc ec5d662ed5a15ff819928c0495017af13910d7b6
 +F Makefile.msc 72a3e9091272201b337908e136de753ba38c8206
  F Makefile.vxworks db21ed42a01d5740e656b16f92cb5d8d5e5dd315
  F README cd04a36fbc7ea56932a4052d7d0b7f09f27c33d6
  F VERSION a8d1f6839521130dc73c5408cdd24bcfd791df34
@@@ -230,14 -216,14 +230,14 @@@ F src/pragma.c 6fb3125fff078cd81db0039a
  F src/prepare.c fa6988589f39af8504a61731614cd4f6ae71554f
  F src/printf.c da9119eb31a187a4b99f60aa4a225141c0ebb74b
  F src/random.c 0b2dbc37fdfbfa6bd455b091dfcef5bdb32dba68
- F src/resolve.c 5f15b00644c36a1610b87857abf42db38c07519c
+ F src/resolve.c 572585a96bf282bb9c3d9e08785ec3cae21dc488
  F src/rowset.c 64655f1a627c9c212d9ab497899e7424a34222e0
  F src/select.c 15127b54cc11defb2cddef6914e1f384501a61c4
- F src/shell.c 6f11f0e9ded63d48e306f2c6858c521e568a47bb
- F src/sqlite.h.in 29199f78f9eba5f935c62dc79a3eb64f26b5e433
+ F src/shell.c d5eebdc6034014103de2b9d58e1d3f6f7de0fb50
 -F src/sqlite.h.in 547a44dd4ff4d975e92a645ea2d609e543a83d0f
++F src/sqlite.h.in f287bd97f9cdf6ec8f57f37cf2e590ed6b9f6302
  F src/sqlite3.rc 11094cc6a157a028b301a9f06b3d03089ea37c3e
  F src/sqlite3ext.h 886f5a34de171002ad46fae8c36a7d8051c190fc
 -F src/sqliteInt.h 4dd81a25a919509ce94b1f8f120bbef14458d4b9
 +F src/sqliteInt.h cc58deabef26a4a82e7b40c47316968e359c6fae
  F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d
  F src/status.c 7ac05a5c7017d0b9f0b4bcd701228b784f987158
  F src/table.c 2cd62736f845d82200acfa1287e33feb3c15d62e
@@@ -293,12 -279,12 +293,12 @@@ F src/update.c be9831a714638ed5b66e2154
  F src/utf.c 6fc6c88d50448c469c5c196acf21617a24f90269
  F src/util.c 2fa6c821d28bbdbeec1b2a7b091a281c9ef8f918
  F src/vacuum.c f313bc97123a4dd4bfd3f50a00c4d44c08a5b1b7
- F src/vdbe.c bc9924611f5cc16ac770bb9a37365c57899edafa
 -F src/vdbe.c 3d960c844cee53830f33717b4f5d23d7ee56685f
 -F src/vdbe.h 4f554b5627f26710c4c36d919110a3fc611ca5c4
 -F src/vdbeInt.h ff57f67aee1ba26a3a47e786533dab155ab6dad6
 -F src/vdbeapi.c 93a22a9ba2abe292d5c2cf304d7eb2e894dde0ed
 -F src/vdbeaux.c 55f4858fe6abd84bd7311acbf30a75a28903ec25
 -F src/vdbeblob.c 5dc79627775bd9a9b494dd956e26297946417d69
++F src/vdbe.c 7663e009b870623f664fc4d4d0634767d4a927a3
 +F src/vdbe.h 7aa3ab6210a68471c8490dedfc9aa4ef5684b9a0
 +F src/vdbeInt.h 2eaf8a38ec76738bbb18429e6c4f317e3766742e
 +F src/vdbeapi.c 8ade912f7023a3b35ee64497a94718ddbd7269c3
 +F src/vdbeaux.c 371a22e7485e57048be1e625eb0b82e3429b0f58
 +F src/vdbeblob.c 1268e0bcb8e21fa32520b0fc376e1bcdfaa0c642
  F src/vdbemem.c 649933bad3e922465b726eaf85c72a75acba2ab7
  F src/vdbesort.c 3937e06b2a0e354500e17dc206ef4c35770a5017
  F src/vdbetrace.c e7ec40e1999ff3c6414424365d5941178966dcbc
@@@ -839,11 -824,11 +839,11 @@@ F test/syscall.test a653783d985108c4912
  F test/sysfault.test fa776e60bf46bdd3ae69f0b73e46ee3977a58ae6
  F test/table.test 30423211108121884588d24d6776c7f38702ad7b
  F test/tableapi.test 2674633fa95d80da917571ebdd759a14d9819126
 -F test/tclsqlite.test 37a61c2da7e3bfe3b8c1a2867199f6b860df5d43
 +F test/tclsqlite.test a7308276aad2e6c0bfb5b0414424dd0d9cc0cad7
  F test/tempdb.test 19d0f66e2e3eeffd68661a11c83ba5e6ace9128c
  F test/temptable.test d2c9b87a54147161bcd1822e30c1d1cd891e5b30
- F test/temptrigger.test 26670ed7a39cf2296a7f0a9e0a1d7bdb7abe936d
+ F test/temptrigger.test 0a48d94222d50e6e50d72ac103606c4f8e7cbb81
 -F test/tester.tcl 5e97d1fe08f45fa3cc2320cee437e315c75ce995
 +F test/tester.tcl 282c1a6b541bd2518a28030884073d1b6dfe98ba
  F test/thread001.test 9f22fd3525a307ff42a326b6bc7b0465be1745a5
  F test/thread002.test e630504f8a06c00bf8bbe68528774dd96aeb2e58
  F test/thread003.test ee4c9efc3b86a6a2767516a37bd64251272560a7
@@@ -1108,11 -1093,11 +1108,11 @@@ F tool/logest.c 7ad625cac3d54012b27d468
  F tool/mkautoconfamal.sh f8d8dbf7d62f409ebed5134998bf5b51d7266383
  F tool/mkkeywordhash.c bb52064aa614e1426445e4b2b9b00eeecd23cc79
  F tool/mkopts.tcl 66ac10d240cc6e86abd37dc908d50382f84ff46e
- F tool/mkpragmatab.tcl 3fc52e00a234750675e8a569d2919ff48558e9eb
+ F tool/mkpragmatab.tcl 17d40faae6c4b865633bfc5763821402a1cbefc3
  F tool/mkspeedsql.tcl a1a334d288f7adfe6e996f2e712becf076745c97
  F tool/mksqlite3c-noext.tcl 8bce31074e4cbe631bb7676526a048335f4c9f02
 -F tool/mksqlite3c.tcl d8dc444d403019167260e5578f5c362741f03696
 -F tool/mksqlite3h.tcl ba24038056f51fde07c0079c41885ab85e2cff12
 +F tool/mksqlite3c.tcl cfc3838294137f89be9abe05fcc967524f1a2618
 +F tool/mksqlite3h.tcl 2d0f1b3768f8d000b7881217d5fd4c776eb27467
  F tool/mksqlite3internalh.tcl 3dca7bb5374cee003379b8cbac73714f610ef795
  F tool/mkvsix.tcl 6477fb9dab838b7eea1eed50658ff1cda04850b5
  F tool/offsets.c fe4262fdfa378e8f5499a42136d17bf3b98f6091
@@@ -1141,7 -1126,7 +1141,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 e111e4edf9d7b2d4d6d6673a7576801839e9537d 8651aba1865a8f82d21d3345f33fbd239fd9a042
- R 1e2f9ded6c7cb8edf0540013bd7feba5
 -P 05a35b09b140fed0898afd36bc641e275545a35f
 -R ff7bb3f8071649882bf49e664fcf0a45
++P 5806546822b717d712dc7cd9de88a86f5bf2f715 3a9e3ed94bf617f00c48009b1a6d348a8f23a3cf
++R 6a218c52fd606677f29de12012a31eb7
  U drh
- Z a8c852ebe46ee653cedb027cf82e79d9
 -Z 9d63edd4f24f764673ec22cc76454487
++Z 6c335f57007a8ea5e658e5dc44efd950
diff --cc manifest.uuid
index b92b5c35de,9f87ae481e..eb5e2715c7
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 5806546822b717d712dc7cd9de88a86f5bf2f715
 -3a9e3ed94bf617f00c48009b1a6d348a8f23a3cf
++aa72ea8a004de7fe744fc13baef19d05aea607d5