Merge support for table-valued functions.

FossilOrigin-Name: 96a5d44d9fcb7b159c04630ad2d956fe27df5a43

diff --cc Makefile.in
Simple merge

diff --cc Makefile.msc
Simple merge

diff --cc main.mk
Simple merge

diff --cc manifest
index c69e955bf74e73e580e147e2a42ee69026b33989,fc133c62472f2ef158f8fd93a8abcf70da9f2f31..9cb46752c26b4e44ab60bbab1c1e414d9c09cca4
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,9 -1,9 +1,9 @@@
- C Comment\sclarification.\s\sNo\schanges\sto\scode.
- D 2015-08-18T12:59:58.393
 -C Improved\scomments\son\sthe\sgenerate_series\svirtual\stable.\s\sTest\scases\sfor\nORDER\sBY\srowid\sDESC\swith\sgenerate_series.
 -D 2015-08-19T18:19:49.786
++C Merge\ssupport\sfor\stable-valued\sfunctions.
++D 2015-08-19T18:31:11.805
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
- F Makefile.in 7669f34c487f5b328de6b508f374ee1e56558bb0
 -F Makefile.in 4f663b6b4954b9b1eb0e6f08387688a93b57542d
++F Makefile.in 90f3097efb9a53f5fc59a4f8a08be07cf9f52c02
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
- F Makefile.msc 0e9dbc907fbd3e08444b5dd4c03e1919442575b8
 -F Makefile.msc cf63e11a5395cf887515ac7b78e2057dfe442fcd
++F Makefile.msc f6ed2ce438f711641dc63d762bb0d41aa659518f
  F Makefile.vxworks e1b65dea203f054e71653415bd8f96dcaed47858
  F README.md 8ecc12493ff9f820cdea6520a9016001cb2e59b7
  F VERSION ccfc4d1576dbfdeece0a4372a2e6a2e37d3e7975
@@@ -256,7 -257,7 +258,7 @@@ F ext/userauth/userauth.c 5fa3bdb492f48
  F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
  F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8
  F magic.txt 8273bf49ba3b0c8559cb2774495390c31fd61c60
- F main.mk d79682036d2dbb4197b09bc5c6a448fd35e7fc9a
 -F main.mk 702135e71d4438ea38c64b22fd6545a0fd87425c
++F main.mk a551a3b8a398e1e64fefbb14bc142aa9584238fc
  F mkopcodec.awk c2ff431854d702cdd2d779c9c0d1f58fa16fa4ea
  F mkopcodeh.awk 0e7f04a8eb90f92259e47d80110e4e98d7ce337a
  F mkso.sh fd21c06b063bb16a5d25deea1752c2da6ac3ed83
@@@ -345,7 -346,7 +347,7 @@@ F src/sqliteLimit.h 216557999cb45f2e357
  F src/status.c f266ad8a2892d659b74f0f50cb6a88b6e7c12179
  F src/table.c 51b46b2a62d1b3a959633d593b89bab5e2c9155e
  F src/tclsqlite.c d9439b6a910985b7fff43ba6756bcef00de22649
- F src/test1.c 0fcf7ae97001ced91bfbfaf738e9689779d9bf61
 -F src/test1.c c12ed85c22ac95f87f79de2ec9553334d115f71e
++F src/test1.c c96508c835979bf15dc0e3146e2c7a51a2333d3c
  F src/test2.c 577961fe48961b2f2e5c8b56ee50c3f459d3359d
  F src/test3.c 64d2afdd68feac1bb5e2ffb8226c8c639f798622
  F src/test4.c d168f83cc78d02e8d35567bb5630e40dcd85ac1e
@@@ -1374,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 4aa49656d98e2894f2faa8963f79462ee6165d40
- R c3c28209f7dd1255986fe872c35f7d65
 -P 40e12cfe4c29475417ba89fb637b4c763cf74016
 -R 9b15d3824a7951b7bf35b7a0abf173ef
++P 71a966952cf8f1d699cf8362ea3f6204c6e16384 fef44c37f31ca9fd7891cecdbe95cc46a987067b
++R c5f483398026c1f31469538c82351663
  U drh
- Z 63f1a876b018989d4396ee5737a9cb33
 -Z a9a479d5c8daf866b811a88820752d86
++Z 387c99525eb324d1b43c55b082d9a722

diff --cc manifest.uuid
index 787f49ef02c3f0ef86248065f06f85406354038a,276e7ea95248a33ef10cf6e114a8e5075e73465f..aa7e5f79eeb9e24e10dbd1eddb89b8ff3152d867
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 71a966952cf8f1d699cf8362ea3f6204c6e16384
 -fef44c37f31ca9fd7891cecdbe95cc46a987067b
++96a5d44d9fcb7b159c04630ad2d956fe27df5a43

diff --cc src/test1.c
Simple merge