From: drh <drh@noemail.net>
Date: Fri, 21 Aug 2015 17:16:22 +0000 (+0000)
Subject: Merge in trunk fixes for table-valued functions.
X-Git-Tag: version-3.9.0~204^2~5
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a7781dc0bbc675613f6ed808596823f6b337d1b5;p=thirdparty%2Fsqlite.git

Merge in trunk fixes for table-valued functions.

FossilOrigin-Name: 67375f32d931351964d75d20671c4a6d8a294d7d
---

a7781dc0bbc675613f6ed808596823f6b337d1b5
diff --cc manifest
index 419e81c64e,b33c9469b9..c983b2cbee
--- a/manifest
+++ b/manifest
@@@ -1,9 -1,9 +1,9 @@@
- C Merge\sthe\slatest\schanges\sfrom\strunk,\sincluding\sthe\stable-valued\sfunction\nimplementation.
- D 2015-08-20T23:39:38.920
 -C Fix\sa\scorner-case\sbug\sin\stable-valued\sfunctions.\s\sUpdate\sthe\sgenerate_series()\nvirtual\stable\sto\sincrease\sthe\sperformance\sestimate\spenalty\sfor\sbeing\nunderspecified.
 -D 2015-08-21T17:14:48.307
++C Merge\sin\strunk\sfixes\sfor\stable-valued\sfunctions.
++D 2015-08-21T17:16:22.562
  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,7 +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 87f5873004f69396baa7c67937342b4e32f79bda 64d13339d44d1b7ec6768a33421f2138cb7872d8
- R 7cb0c5cf7638f854f546d2b854265d5a
 -P 7b8d17dd840f64dac9a018a4547a97de799e94ab
 -R 9cda90020c632a4b5578f3716c43ea3f
++P 10c444322f05ea8b83247f96a140bf3dbc4e9448 552bc9cb88bbe54b4cf5fdf66d1217e7a2047110
++R 441bca8d1af26d87c1bda0270d4383f2
  U drh
- Z b0a1e35f3ba6f64feb361a23fa5a6c80
 -Z 56572d82de750944343824c6ac2ac974
++Z 2a07a4f1c8b04ac159cc9be6e6c7d9c7
diff --cc manifest.uuid
index aa0f95afca,ae5ce62080..5d24a36fb9
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 10c444322f05ea8b83247f96a140bf3dbc4e9448
 -552bc9cb88bbe54b4cf5fdf66d1217e7a2047110
++67375f32d931351964d75d20671c4a6d8a294d7d