From: drh <drh@noemail.net>
Date: Wed, 19 Aug 2015 19:26:13 +0000 (+0000)
Subject: Merge the table-valued-function rowid fix.
X-Git-Tag: version-3.9.0~204^2~9
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=222cd5bee2d5ba2dc475253205885b68a3cd7278;p=thirdparty%2Fsqlite.git

Merge the table-valued-function rowid fix.

FossilOrigin-Name: a06a6392bd48baa8b9bac2624869c0cc7da7e779
---

222cd5bee2d5ba2dc475253205885b68a3cd7278
diff --cc manifest
index 9cb46752c2,38f503e8f1..fa1a720a00
--- a/manifest
+++ b/manifest
@@@ -1,9 -1,9 +1,9 @@@
- C Merge\ssupport\sfor\stable-valued\sfunctions.
- D 2015-08-19T18:31:11.805
 -C Fix\seponymous\svirtual\stables\sso\sthat\sthey\sdo\snot\sautomatically\smake\sthe\sfirst\ncolumn\sthe\srowid.\s\sEnhance\sthe\sgenerate_series\svirtual\stable\sto\ssupport\srowid.
 -D 2015-08-19T19:01:28.078
++C Merge\sthe\stable-valued-function\srowid\sfix.
++D 2015-08-19T19:26:13.526
  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 71a966952cf8f1d699cf8362ea3f6204c6e16384 fef44c37f31ca9fd7891cecdbe95cc46a987067b
- R c5f483398026c1f31469538c82351663
 -P fef44c37f31ca9fd7891cecdbe95cc46a987067b
 -R a41603407a6c0b327e60b148f02b0042
++P 96a5d44d9fcb7b159c04630ad2d956fe27df5a43 a325a08599759471047e234ef9cfcc3cb110aafd
++R dcfe96af8a1b65c426e62b553bd60db8
  U drh
- Z 387c99525eb324d1b43c55b082d9a722
 -Z aa56d5c64521b30a9993ce3328198562
++Z 00eb910bc67976561bafd5a76ff4be3d
diff --cc manifest.uuid
index aa7e5f79ee,8d7098b5e3..ab65dd6ddb
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 96a5d44d9fcb7b159c04630ad2d956fe27df5a43
 -a325a08599759471047e234ef9cfcc3cb110aafd
++a06a6392bd48baa8b9bac2624869c0cc7da7e779