From: drh <drh@noemail.net>
Date: Thu, 3 Apr 2014 16:35:33 +0000 (+0000)
Subject: Merge all recent changes from trunk,
X-Git-Tag: version-3.13.0~148^2~147
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=652cc4b6dca02426e8d375a962bf8417850d9f7a;p=thirdparty%2Fsqlite.git

Merge all recent changes from trunk,
including the fix for the OP_SCopy-vs-OP_Copy problem.

FossilOrigin-Name: 9515c8344a6743bbb0c6a6e49fb79fb3139090df
---

652cc4b6dca02426e8d375a962bf8417850d9f7a
diff --cc manifest
index aaca6b665e,4bcee0a832..0602716bed
--- a/manifest
+++ b/manifest
@@@ -1,9 -1,9 +1,9 @@@
- C Merge\sin\sfixes\s(including\sthe\scorrupt-database\scrash\sfix)\sand\nperformance\senhancements\sfrom\strunk.
- D 2014-03-26T19:43:30.427
 -C Use\sOP_Copy\sinstead\sof\sOP_SCopy\swhen\smoving\sresults\sout\sof\sa\ssubquery,\nto\sprevent\sthe\ssubquery\sresults\sfrom\schanging\sout\sfrom\sunder\sthe\souter\nquery.\s\sFix\sfor\sticket\s[1e64dd782a126f48d78].
 -D 2014-04-03T16:29:31.330
++C Merge\sall\srecent\schanges\sfrom\strunk,\nincluding\sthe\sfix\sfor\sthe\sOP_SCopy-vs-OP_Copy\sproblem.
++D 2014-04-03T16:35:33.203
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 -F Makefile.in 2ef13430cd359f7b361bb863504e227b25cc7f81
 +F Makefile.in e4ee6d36cdf6136aee0158675a3b24dd3bf31a5a
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
 -F Makefile.msc fdacba6fb574868c71fde6db6b77789a383a4c19
 +F Makefile.msc b448317831d9c364bf501538becce5cc1f0a0f8b
  F Makefile.vxworks db21ed42a01d5740e656b16f92cb5d8d5e5dd315
  F README.md 64f270c43c38c46de749e419c22f0ae2f4499fe8
  F VERSION 9f823c026c6a32fc5f84d212a8aae0a221dba45c
@@@ -232,11 -218,11 +232,11 @@@ F src/random.c d10c1f85b6709ca97278428f
  F src/resolve.c 273d5f47c4e2c05b2d3d2bffeda939551ab59e66
  F src/rowset.c 64655f1a627c9c212d9ab497899e7424a34222e0
  F src/select.c 269c3e31a450fce642a10569221a49180348c88e
- F src/shell.c cee9f46f2688a261601b1fd3d7f4b3cddf9b5cdf
+ F src/shell.c 5260f2ada8dd06e9f5ae0a448c8c01e7a75dd881
 -F src/sqlite.h.in a2ef671f92747a5a1c8a47bad5c585a8dd9eca80
 +F src/sqlite.h.in a31c8b7782a0388b4bd823ed3a3a3e4b93b0cf42
  F src/sqlite3.rc 11094cc6a157a028b301a9f06b3d03089ea37c3e
  F src/sqlite3ext.h 886f5a34de171002ad46fae8c36a7d8051c190fc
- F src/sqliteInt.h b0fa7a8b72fceda6bf989fba2699b5208c861cbc
 -F src/sqliteInt.h cc9582a91b2910404ccda7b7e198815ea0f75948
++F src/sqliteInt.h 2ce2e12bc5a4cf8e5511ee11ee4778a1911be7e9
  F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d
  F src/status.c 7ac05a5c7017d0b9f0b4bcd701228b784f987158
  F src/table.c 2cd62736f845d82200acfa1287e33feb3c15d62e
@@@ -292,12 -278,12 +292,12 @@@ F src/update.c 7bb549d61efc6853f5cc708c
  F src/utf.c 6dc9ec9f1b3db43ae8ba0365377f11df1ee4c01c
  F src/util.c c46c90459ef9bdc0c6c73803cf4c55425b4771cf
  F src/vacuum.c 3728d74919d4fb1356f9e9a13e27773db60b7179
- F src/vdbe.c 99f878d003314340d6a1e8a8bb185b60ced628df
- F src/vdbe.h e8e1219a7fd7395deb7a9824f9b7757d642fcf1a
- F src/vdbeInt.h faadf45c5a0c32a251228222fed380ab1389202e
 -F src/vdbe.c e811a0081149fb90db367026d154cd7efb3c7098
 -F src/vdbe.h 394464909ed682334aa3d5831aae0c2fe2abef94
 -F src/vdbeInt.h e6d83e5bfd62fc6685ba1ed6153f7099f82de9f7
 -F src/vdbeapi.c 0ed6053f947edd0b30f64ce5aeb811872a3450a4
 -F src/vdbeaux.c 1153175fb57a8454e1c8cf79b59b7bf92b26779d
 -F src/vdbeblob.c 15377abfb59251bccedd5a9c7d014a895f0c04aa
++F src/vdbe.c 47bdf5f82fa23548bc0ee720c54e3b2b8802babe
++F src/vdbe.h d03fcf47890ae1c79a335ca994cb878b302697ca
++F src/vdbeInt.h c05d4572211384c560b7579e7a299248cf31d6bd
 +F src/vdbeapi.c d3c662762b62e330a03f29de8e2ac7098ef78030
- F src/vdbeaux.c 74aa0e2e9c87b2e9c9cdea501dbf9243d7b7759b
++F src/vdbeaux.c f9c225c26b4cab6239a7790b4bd14a6cd96ba19e
 +F src/vdbeblob.c 2d1f0fdb0f5b72118520980360a594b1c30cbdd8
  F src/vdbemem.c 6fc77594c60f6155404f3f8d71bf36d1fdeb4447
  F src/vdbesort.c 4abb7c0f8f19b7d7d82f4558d5da1a30fdf9ea38
  F src/vdbetrace.c 6f52bc0c51e144b7efdcfb2a8f771167a8816767
@@@ -1174,7 -1159,8 +1174,7 @@@ F tool/vdbe_profile.tcl 67746953071a9f8
  F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
  F tool/warnings.sh d1a6de74685f360ab718efda6265994b99bbea01
  F tool/win/sqlite.vsix 030f3eeaf2cb811a3692ab9c14d021a75ce41fff
- P 42c9d8fc5fe4f0250bfa1f977c7cc63e5741408f f585f5d7a0f9bf8c590388654a3638231eba8892
- R fc3fab040eeffed1a38e67c3557fec70
 -P 48ecdd4aff03741f96c070dced69c3c273b652cb
 -Q +ec6a06246e04eee5f25f1c28507df73b697099c0
 -R b6a2fefa5b61ea0e64da4db2aaa10286
++P fc8ca1a87e7127bd28f32fd809aec3e24355fbfa d5513dfa23baa0b0a095aaf17d19aacd30dcef61
++R 507e4fb477cf51261d2563e52f7cfa77
  U drh
- Z 657de079eefd6dd1d0e2ef048fcceef3
 -Z f1f1ceb5f31f4e26d736a13a2a5aca0f
++Z a91c37323943563a6d3bfb60a104e003
diff --cc manifest.uuid
index bf4c73b05e,601b0b4f2e..7a0e457ea7
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- fc8ca1a87e7127bd28f32fd809aec3e24355fbfa
 -d5513dfa23baa0b0a095aaf17d19aacd30dcef61
++9515c8344a6743bbb0c6a6e49fb79fb3139090df