From: dan <dan@noemail.net>
Date: Fri, 1 Jul 2011 18:43:13 +0000 (+0000)
Subject: Merge latest trunk changes with experimental branch.
X-Git-Tag: version-3.7.8~38^2~31^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=bac8158a85a705e87ee343e415ef726712e5ce23;p=thirdparty%2Fsqlite.git

Merge latest trunk changes with experimental branch.

FossilOrigin-Name: e56be74eabc03d1a524d96aa4e87102dea4e348e
---

bac8158a85a705e87ee343e415ef726712e5ce23
diff --cc manifest
index 2ac880f628,52a2aaa76b..2dd09e925a
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Improve\suse\sof\sindexes\sto\soptimize\sDISTINCT\squeries.
- D 2011-07-01T18:26:40.769
 -C Test\scase\sfor\sticket\s[d6ddba6706353915ceed]
 -D 2011-07-01T14:22:04.191
++C Merge\slatest\strunk\schanges\swith\sexperimental\sbranch.
++D 2011-07-01T18:43:13.469
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in c1d7a7f4fd8da6b1815032efca950e3d5125407e
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@@ -233,8 -233,8 +233,8 @@@ F src/test_vfstrace.c 0b884e06094a746da
  F src/test_wholenumber.c 6129adfbe7c7444f2e60cc785927f3aa74e12290
  F src/test_wsd.c 41cadfd9d97fe8e3e4e44f61a4a8ccd6f7ca8fe9
  F src/tokenize.c c819d9f72168a035d545a5bdafe9b085b20df705
- F src/trigger.c c836a6caac16ba96611558922106858f6ca3d6bf
+ F src/trigger.c 1cfb80e2290ef66ea89cb4e821caae65a02c0d56
 -F src/update.c 80d77311d91ebc06b27149e75701f1b3e9356622
 +F src/update.c 74a6cfb34e9732c1e2a86278b229913b4b51eeec
  F src/utf.c c53eb7404b3eb5c1cbb5655c6a7a0e0ce6bd50f0
  F src/util.c 0f33bbbdfcc4a2d8cf20c3b2a16ffc3b57c58a70
  F src/vacuum.c 05513dca036a1e7848fe18d5ed1265ac0b32365e
@@@ -950,7 -949,7 +950,7 @@@ F tool/symbols.sh bc2a3709940d47c8ac8e0
  F tool/tostr.awk 11760e1b94a5d3dcd42378f3cc18544c06cfa576
  F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
  F tool/warnings.sh 2ebae31e1eb352696f3c2f7706a34c084b28c262
- P 7337293c87fb563604dd6ad284f2d1e30c938b4c
- R 0a65cc1234bf3efb15e20cfbd6948f45
 -P 009c96ea7836edf75d65b150055e920079bb45e3
 -R c79f1fc1420004e852fc4dd4b2df1b0e
 -U drh
 -Z fee6ccae1aad0120ae0a15394efb76ef
++P 6c202ea0247ff509f696eee3839975a88ed26cf2 953e169e8a7dac05a0b56b4ef5d500ec8399d37f
++R 0920e7efb36d6d861c0873d40a58b5e8
 +U dan
- Z be26c18c91323ba4302e319914f9eafb
++Z 076f69de0e54769c5ccba2bae7e8f9fd
diff --cc manifest.uuid
index f1ce564ac1,f76287d586..40e2339bd7
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 6c202ea0247ff509f696eee3839975a88ed26cf2
 -953e169e8a7dac05a0b56b4ef5d500ec8399d37f
++e56be74eabc03d1a524d96aa4e87102dea4e348e