From: dan <dan@noemail.net>
Date: Mon, 23 Nov 2015 17:14:03 +0000 (+0000)
Subject: Merge latest trunk changes with this branch.
X-Git-Tag: version-3.22.0~147^2~64
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=09c480aba18305f4b224b176d1d8a5c6b471734f;p=thirdparty%2Fsqlite.git

Merge latest trunk changes with this branch.

FossilOrigin-Name: 8f1ef0904d055b5510ec9043810ebf22a8c5e253
---

09c480aba18305f4b224b176d1d8a5c6b471734f
diff --cc manifest
index fb61058c44,1ed1813193..cd40a978a6
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Fix\sORDER\sBY\shandling\sin\sthe\sschemalint.tcl\sscript.\sAdd\sinternal\sself-tests\sto\sthe\ssame\sscript.
- D 2015-11-23T17:10:51.938
 -C Fix\san\sobscure\smemory\sleak\sfound\sby\slibfuzzer\sthat\smay\soccur\sunder\ssome\scircumstances\sif\sexpanding\sa\s"*"\sexpression\scauses\sa\sSELECT\sto\sreturn\smore\sthan\s32767\scolumns.
 -D 2015-11-21T19:43:29.760
++C Merge\slatest\strunk\schanges\swith\sthis\sbranch.
++D 2015-11-23T17:14:03.947
  F Makefile.in d828db6afa6c1fa060d01e33e4674408df1942a1
  F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
  F Makefile.msc e928e68168df69b353300ac87c10105206653a03
@@@ -416,10 -416,10 +416,10 @@@ F src/vxworks.h c18586c8edc1bddbc15c004
  F src/wal.c 18b0ed49830cf04fe2d68224b41838a73ac6cd24
  F src/wal.h df01efe09c5cb8c8e391ff1715cca294f89668a4
  F src/walker.c 2e14d17f592d176b6dc879c33fbdec4fbccaa2ba
 -F src/where.c 6aceb72cc58dc06922a9e1604d559c8ca4c3e728
 +F src/where.c 5804902239731a7025240f4338d98cdc57315636
  F src/whereInt.h 7892bb54cf9ca0ae5c7e6094491b94c9286dc647
  F src/wherecode.c 4c96182e7b25e4be54008dee2da5b9c2f8480b9b
- F src/whereexpr.c e63244ca06c503e5f3c5b7f3c9aea0db826089ed
+ F src/whereexpr.c bd4877cd4dd11f6ab551ef0054535ca3c6224950
  F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2
  F test/affinity2.test a6d901b436328bd67a79b41bb0ac2663918fe3bd
  F test/aggerror.test a867e273ef9e3d7919f03ef4f0e8c0d2767944f2
@@@ -1404,7 -1404,7 +1406,7 @@@ F tool/vdbe_profile.tcl 246d0da094856d7
  F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
  F tool/warnings.sh 48bd54594752d5be3337f12c72f28d2080cb630b
  F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
- P 93bdf70e859915ff3696ba0fc68f91ceb2e1a971
- R 4554e59743437c1fee4689a6514241d8
 -P 198d191b2f5ef7d63ac0093c701955c9052fd734
 -R 8ed8d9e954ea81e19ae35a6836359b00
++P b8f277c9b45c4b30e6690e838a30311aa8d84876 60de5f23424552c98aa760ac89149a3d51f895be
++R 00875769a91e68d074e499acf18a7d59
  U dan
- Z f43cf07c3dedebc0e4a9e76dc40982d5
 -Z f96d100152be981f85597b50bc9a8134
++Z 5eb820ab8a7550b698dcf8a7d000e044
diff --cc manifest.uuid
index 7790e3b6f1,90fb983695..b038ee0b5d
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- b8f277c9b45c4b30e6690e838a30311aa8d84876
 -60de5f23424552c98aa760ac89149a3d51f895be
++8f1ef0904d055b5510ec9043810ebf22a8c5e253