From: dan <dan@noemail.net>
Date: Sat, 12 May 2012 11:50:41 +0000 (+0000)
Subject: Update sessions branch with trunk changes.
X-Git-Tag: version-3.13.0~148^2~237
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3581020e53e42634603620691aae3c48634cddb9;p=thirdparty%2Fsqlite.git

Update sessions branch with trunk changes.

FossilOrigin-Name: 3f4848a871a4229ff6951eefaf7673de46d2c43f
---

3581020e53e42634603620691aae3c48634cddb9
diff --cc manifest
index 244bbf8c03,36cfd7d064..4d0957ef89
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Merge\sin\sthe\swindows\sAV-defense\senhancements\sfor\sopen()\sand\sthe\stable\nconstraint\sparser\sfixes\sfor\slegacy\sschemas,\sall\sfrom\strunk.
- D 2012-05-10T12:17:18.151
 -C Before\srunning\seach\stest\sscript,\smake\ssure\sthe\sFTS\senhanced\squery\ssyntax\sis\sdisabled.
 -D 2012-05-12T05:30:29.959
++C Update\ssessions\sbranch\swith\strunk\schanges.
++D 2012-05-12T11:50:41.131
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in 2f37e468503dbe79d35c9f6dffcf3fae1ae9ec20
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@@ -739,7 -726,7 +739,7 @@@ F test/tclsqlite.test 2f2aa887763af3064
  F test/tempdb.test 19d0f66e2e3eeffd68661a11c83ba5e6ace9128c
  F test/temptable.test 51edd31c65ed1560dd600b1796e8325df96318e2
  F test/temptrigger.test 26670ed7a39cf2296a7f0a9e0a1d7bdb7abe936d
- F test/tester.tcl e9e495e68f7c5e0e17561acdfcb59ca6679ff019
 -F test/tester.tcl a55e066251bc05e26f9da00e76644ab649b26f3c
++F test/tester.tcl f341da6a8982a5d1c521a45c9dd09260d728a147
  F test/thread001.test 7cc2ce08f9cde95964736d11e91f9ab610f82f91
  F test/thread002.test e630504f8a06c00bf8bbe68528774dd96aeb2e58
  F test/thread003.test ee4c9efc3b86a6a2767516a37bd64251272560a7
@@@ -1009,7 -997,7 +1010,7 @@@ F tool/tostr.awk e75472c2f98dd76e06b8c9
  F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
  F tool/warnings-clang.sh a8a0a3babda96dfb1ff51adda3cbbf3dfb7266c2
  F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
- P 0f347fbfc7d8821f56f1ae0d1a9472a375631e65 38bf90af1ede6ee64ef7be66392e895e60c9126e
- R 21dedc1a34649558aea7c289d84ec993
- U drh
- Z bf3857ddf912fd88e60d600cf99c392f
 -P 93061c6e063fddfa6b5d21064a36b58cc97599f1
 -R 1266fdc6649c7c37fc945bf3a68e25cb
++P 323570b8bd52c7e1b0c8c7a0e4f57f6fdebead11 f84d87bcc0e4f6f56d01556b2b1dc27ebef9ce26
++R 638df784a54d2791b773a7681a2d1690
+ U dan
 -Z efae0d0fc97871bb7b1020786a272a5c
++Z 30a906fd51de4488c11598c55a1906ac
diff --cc manifest.uuid
index 594a95aba4,beee1a4763..4c7a6bec4f
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 323570b8bd52c7e1b0c8c7a0e4f57f6fdebead11
 -f84d87bcc0e4f6f56d01556b2b1dc27ebef9ce26
++3f4848a871a4229ff6951eefaf7673de46d2c43f