From: drh <drh@noemail.net>
Date: Wed, 3 Aug 2011 21:46:58 +0000 (+0000)
Subject: Merge the latest trunk changes into the sessions branch.
X-Git-Tag: version-3.13.0~148^2~256
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0e9a916c36b30f1aac17fb46f629013d7886eeed;p=thirdparty%2Fsqlite.git

Merge the latest trunk changes into the sessions branch.

FossilOrigin-Name: c5709036087b6b4fb6391ab7e4b4b870aac87a31
---

0e9a916c36b30f1aac17fb46f629013d7886eeed
diff --cc manifest
index a887475f95,f8aebc816c..66407107f1
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Avoid\ssegfaulting\son\san\sincremental\sblob\swrite\sif\sSQLITE_ENABLE_PREUPDATE_HOOK\nset\sbut\sno\spre-update\shooks\sare\sdefined.
- D 2011-08-03T21:32:11.649
 -C Update\sthe\sOP_Move\sopcode\sto\sshift\sthe\spScopyFrom\spointer\sof\saliases\swhen\ncompiled\swith\sSQLITE_DEBUG.\s\sTicket\s[d63523637517386191].
 -D 2011-08-03T16:40:15.202
++C Merge\sthe\slatest\strunk\schanges\sinto\sthe\ssessions\sbranch.
++D 2011-08-03T21:46:58.295
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in 1e6988b3c11dee9bd5edc0c804bd4468d74a9cdc
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@@ -193,14 -181,14 +193,14 @@@ F src/resolve.c 36368f44569208fa074e61f
  F src/rowset.c 69afa95a97c524ba6faf3805e717b5b7ae85a697
  F src/select.c d219c4b68d603cc734b6f9b1e2780fee12a1fa0d
  F src/shell.c bbe7818ff5bc8614105ceb81ad67b8bdc0b671dd
- F src/sqlite.h.in 4cd98228ea9cbb0359aaf725fdbebcd37c082c6a
 -F src/sqlite.h.in 0b3cab7b2ea51f58396e8871fa5f349cfece5330
++F src/sqlite.h.in db27d510c1016b3dfbac947bccfe7b648d1fa478
  F src/sqlite3ext.h 1a1a4f784aa9c3b00edd287940197de52487cd93
 -F src/sqliteInt.h ba4a6d6288efb25b84bc0d7d0aaf80f9b42523ba
 +F src/sqliteInt.h 113559f0c2202c4e648b5d647d7b2409604fb516
  F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d
  F src/status.c 7ac64842c86cec2fc1a1d0e5c16d3beb8ad332bf
  F src/table.c 2cd62736f845d82200acfa1287e33feb3c15d62e
 -F src/tclsqlite.c c355b33803fb756dc09297ec84d19604301fa622
 +F src/tclsqlite.c e85bada4bf1796274a2cd7b3db9a663f8df31880
- F src/test1.c 693d9a63dfe2c68b167080c99cab82f267f5a38e
+ F src/test1.c e7ea726d26b9007bae7907d8b40280c70ec6c504
  F src/test2.c 80d323d11e909cf0eb1b6fbb4ac22276483bcf31
  F src/test3.c 124ff9735fb6bb7d41de180d6bac90e7b1509432
  F src/test4.c d1e5a5e904d4b444cf572391fdcb017638e36ff7
@@@ -250,12 -238,12 +250,12 @@@ F src/update.c 2d67e24d5a44d8b1c0839bf2
  F src/utf.c c53eb7404b3eb5c1cbb5655c6a7a0e0ce6bd50f0
  F src/util.c 06302ffd2b80408d4f6c7af71f7090e0cf8d8ff7
  F src/vacuum.c 05513dca036a1e7848fe18d5ed1265ac0b32365e
- F src/vdbe.c 00061273468d03c6c5c0f6144ed219c0004cf849
 -F src/vdbe.c 49d834f0fe49d305e07f9c212e94007fda2028e9
 -F src/vdbe.h 5cf09e7ee8a3f7d93bc51f196a96550786afe7a1
 -F src/vdbeInt.h ad84226cc0adcb1185c22b70696b235a1678bb45
 -F src/vdbeapi.c 11dc47987abacb76ad016dcf5abc0dc422482a98
 -F src/vdbeaux.c 4d100407e3c72e163854aff8903d19d5ecdf46c0
 -F src/vdbeblob.c f024f0bf420f36b070143c32b15cc7287341ffd3
++F src/vdbe.c 303d8b3bc93a464739c03b2fff51d360dcf1a163
 +F src/vdbe.h 322af148cceef120bb1ec9cff7f122e76abf94da
 +F src/vdbeInt.h 3de6588b36c833969aebab202e1766d586c37ec2
 +F src/vdbeapi.c ddd061183e2c3015f676e53ee85fcaf306617e8e
 +F src/vdbeaux.c 7d0b75a04ac466d25a90fefd1df83361a2ab0ad7
 +F src/vdbeblob.c fde0374afb0c512614aed191ac2683f6772d2b8f
  F src/vdbemem.c 0498796b6ffbe45e32960d6a1f5adfb6e419883b
  F src/vdbetrace.c 5d0dc3d5fd54878cc8d6d28eb41deb8d5885b114
  F src/vtab.c 901791a47318c0562cd0c676a2c6ff1bc530e582
@@@ -628,7 -616,7 +628,7 @@@ F test/pageropt.test 8146bf448cf09e87bb
  F test/pagesize.test 76aa9f23ecb0741a4ed9d2e16c5fa82671f28efb
  F test/pcache.test 065aa286e722ab24f2e51792c1f093bf60656b16
  F test/pcache2.test 0d85f2ab6963aee28c671d4c71bec038c00a1d16
- F test/permutations.test df39e810d98a966218ef1391afb4e25491af698f
 -F test/permutations.test 2c845b5c8cd2abb32f07076734d10e6a9fd19f26
++F test/permutations.test f9ad1fcadd10a7fd4014de58e61178c3329a5c03
  F test/pragma.test fdfc09067ea104a0c247a1a79d8093b56656f850
  F test/pragma2.test 5364893491b9231dd170e3459bfc2e2342658b47
  F test/printf.test 05970cde31b1a9f54bd75af60597be75a5c54fea
@@@ -965,7 -955,7 +968,7 @@@ F tool/symbols.sh caaf6ccc7300fd4335331
  F tool/tostr.awk 11760e1b94a5d3dcd42378f3cc18544c06cfa576
  F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
  F tool/warnings.sh 2ebae31e1eb352696f3c2f7706a34c084b28c262
- P d5f4c4c0bf0d488db11c6ab0d26ca3554a57d0ff
- R dc4862fa4ca184e0298413704bde1899
 -P 78fc94c8d1229a8bdc9390e98b53c57aeef7fc46
 -R bf0be95f6edb13861054cdf974a28d09
++P 62c446340475b52b843c0345eda32ebe86fa9159 a2135ad13049c170b33315a949b1544e6a136183
++R 734a54c8f931fe24e65682db655c7b9e
  U drh
- Z abe606476a76771b05a5d0a0f3902dc5
 -Z 63c3906617d97d8acb37208d4ff59628
++Z 34a261d71dea5b8394b2283d95dc3275
diff --cc manifest.uuid
index 492ab34ae1,fe62bb02b3..81043c95b6
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 62c446340475b52b843c0345eda32ebe86fa9159
 -a2135ad13049c170b33315a949b1544e6a136183
++c5709036087b6b4fb6391ab7e4b4b870aac87a31