From: drh <drh@noemail.net>
Date: Thu, 20 Aug 2015 23:39:38 +0000 (+0000)
Subject: Merge the latest changes from trunk, including the table-valued function
X-Git-Tag: version-3.9.0~204^2~6
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=684295242908b3a66871b3b6cd5ff4821556291c;p=thirdparty%2Fsqlite.git

Merge the latest changes from trunk, including the table-valued function
implementation.

FossilOrigin-Name: 10c444322f05ea8b83247f96a140bf3dbc4e9448
---

684295242908b3a66871b3b6cd5ff4821556291c
diff --cc manifest
index 28efbe5685,67a5b345e2..419e81c64e
--- a/manifest
+++ b/manifest
@@@ -1,9 -1,9 +1,9 @@@
- C Fix\sthe\spath\slookup\sfor\sobjects\sso\sthat\sit\scan\shandle\squoted\sidentifier\nnames\sand\snon-alphanumerics\sin\sthe\sidentifier.
- D 2015-08-19T23:02:49.082
 -C Compiler-warning\sfixes\sin\sthe\ssqldiff.exe\sutility.
 -D 2015-08-20T23:33:09.816
++C Merge\sthe\slatest\schanges\sfrom\strunk,\sincluding\sthe\stable-valued\sfunction\nimplementation.
++D 2015-08-20T23:39:38.920
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 -F Makefile.in 4f663b6b4954b9b1eb0e6f08387688a93b57542d
 +F Makefile.in 90f3097efb9a53f5fc59a4f8a08be07cf9f52c02
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
 -F Makefile.msc cf63e11a5395cf887515ac7b78e2057dfe442fcd
 +F Makefile.msc f6ed2ce438f711641dc63d762bb0d41aa659518f
  F Makefile.vxworks e1b65dea203f054e71653415bd8f96dcaed47858
  F README.md 8ecc12493ff9f820cdea6520a9016001cb2e59b7
  F VERSION ccfc4d1576dbfdeece0a4372a2e6a2e37d3e7975
@@@ -1378,7 -1376,8 +1378,7 @@@ F tool/vdbe_profile.tcl 67746953071a9f8
  F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
  F tool/warnings.sh 48bd54594752d5be3337f12c72f28d2080cb630b
  F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
- P 3335ac17bbcb09dc915173d69bf42048f84ad563
- R bd9ac56614e747436a95e2948b6eea19
 -P bc577fe6cbbe5385d81d6fa0f3c34bb1c833f0d6 072279d458fbb74a812a9ee723041d6b7c662a88
 -R 945241c39c0e2b8c88fe2d95b8e90177
 -T +closed 072279d458fbb74a812a9ee723041d6b7c662a88
++P 87f5873004f69396baa7c67937342b4e32f79bda 64d13339d44d1b7ec6768a33421f2138cb7872d8
++R 7cb0c5cf7638f854f546d2b854265d5a
  U drh
- Z b6a64887dfaaae356da3f82cf4115061
 -Z 016c7dc0deb1c398804e42d942b63fbc
++Z b0a1e35f3ba6f64feb361a23fa5a6c80
diff --cc manifest.uuid
index 40c8eba985,cb7f7ee87d..aa0f95afca
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 87f5873004f69396baa7c67937342b4e32f79bda
 -64d13339d44d1b7ec6768a33421f2138cb7872d8
++10c444322f05ea8b83247f96a140bf3dbc4e9448