Merge recent trunk enhancements, include table-valued functions.

FossilOrigin-Name: e9196d566690de0e9815f8cd85be7844322b5a79

diff --cc Makefile.in
Simple merge

diff --cc Makefile.msc
Simple merge

diff --cc main.mk
Simple merge

diff --cc manifest
index f8c7b41f3347f843fd577a27bca6a448b04d1638,67a5b345e29d2c0f8a2fe971c8635fedd1f49db7..72c7b00892e236666092fec4e9d0ba47a1516f0a
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,12 -1,12 +1,12 @@@
- C Merge\stest\simprovements\sand\sminor\sfixes\sfrom\strunk.
- D 2015-07-24T22:21:01.450
 -C Compiler-warning\sfixes\sin\sthe\ssqldiff.exe\sutility.
 -D 2015-08-20T23:33:09.816
++C Merge\srecent\strunk\senhancements,\sinclude\stable-valued\sfunctions.
++D 2015-08-20T23:54:25.007
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
- F Makefile.in bb0577f51dd8eda80a4d14bcf830f9696e31dcce
 -F Makefile.in 4f663b6b4954b9b1eb0e6f08387688a93b57542d
++F Makefile.in 7c77beda9c1e956ff754ff12141b4b2ed033686b
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
- F Makefile.msc 60f6a05fe6da8ec23596df656b3fa6c2e052cc20
 -F Makefile.msc cf63e11a5395cf887515ac7b78e2057dfe442fcd
++F Makefile.msc e978ec57e8eb6e2f5b8a5114fa8cb320626337ca
  F Makefile.vxworks e1b65dea203f054e71653415bd8f96dcaed47858
  F README.md 8ecc12493ff9f820cdea6520a9016001cb2e59b7
- F VERSION ce0ae95abd7121c534f6917c1c8f2b70d9acd4db
+ F VERSION ccfc4d1576dbfdeece0a4372a2e6a2e37d3e7975
  F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
  F addopcodes.awk 9eb448a552d5c0185cf62c463f9c173cedae3811
  F art/sqlite370.eps aa97a671332b432a54e1d74ff5e8775be34200c2
@@@ -268,7 -257,7 +276,7 @@@ F ext/userauth/userauth.c 5fa3bdb492f48
  F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
  F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8
  F magic.txt 8273bf49ba3b0c8559cb2774495390c31fd61c60
- F main.mk 0918e34121c7d5120d34a27653cb4bcd16d532fe
 -F main.mk 702135e71d4438ea38c64b22fd6545a0fd87425c
++F main.mk 2d090a509da78d5dde9da7062ff0c104a4bb3023
  F mkopcodec.awk c2ff431854d702cdd2d779c9c0d1f58fa16fa4ea
  F mkopcodeh.awk 0e7f04a8eb90f92259e47d80110e4e98d7ce337a
  F mkso.sh fd21c06b063bb16a5d25deea1752c2da6ac3ed83
@@@ -298,8 -287,8 +306,8 @@@ F src/complete.c addcd8160b081131005d5b
  F src/ctime.c 5a0b735dc95604766f5dac73973658eef782ee8b
  F src/date.c 8ec787fed4929d8ccdf6b1bc360fccc3e1d2ca58
  F src/dbstat.c f402e77e25089c6003d0c60b3233b9b3947d599a
 -F src/delete.c 8857a6f27560718f65d43bdbec86c967ae1f8dfa
 +F src/delete.c b998fbc3c55e8331a5f40aa7ff80972254de8de1
- F src/expr.c c5c58e4d01c7ceb2266791d8d877f1b23a88e316
+ F src/expr.c 9b9fa7f825290dee945007edc9fe8fdd9b8ce49e
  F src/fault.c 160a0c015b6c2629d3899ed2daf63d75754a32bb
  F src/fkey.c c9b63a217d86582c22121699a47f22f524608869
  F src/func.c 824bea430d3a2b7dbc62806ad54da8fdb8ed9e3f
@@@ -307,12 -296,12 +315,12 @@@ F src/global.c 508e4087f7b41d688e4762dc
  F src/hash.c 4263fbc955f26c2e8cdc0cf214bc42435aa4e4f5
  F src/hash.h c8f3c31722cf3277d03713909761e152a5b81094
  F src/hwtime.h d32741c8f4df852c7d959236615444e2b1063b08
- F src/insert.c a81d4454051c92d058d79cd77099e700e36a74f6
 -F src/insert.c 842026863c726df5420f896a8c10eb3e150f9864
++F src/insert.c 43e48fa63c9b9b5f195a13c40ddf7fd112370bb2
  F src/journal.c b4124532212b6952f42eb2c12fa3c25701d8ba8d
  F src/legacy.c ba1863ea58c4c840335a84ec276fc2b25e22bc4e
  F src/lempar.c 92bafa308607dd985ca389a788cd9e0a2b608712
  F src/loadext.c dfcee8c7c032cd0fd55af3e0fc1fcfb01e426df2
- F src/main.c 6dd8bf94f181925a50a1f494042e50a64d5ecaca
 -F src/main.c e17fcffae4306a9b8334faf3bac80d7396850b54
++F src/main.c 9e2e596c97401a7b99f2f500f5e2c725d53eabe2
  F src/malloc.c 19461e159bccf0e2cf06a50e867963d0a7b124a8
  F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
  F src/mem1.c abe6ee469b6c5a35c7f22bfeb9c9bac664a1c987
@@@ -345,19 -334,19 +353,19 @@@ F src/pragma.h 631a91c8b0e6ca8f051a1d8a
  F src/prepare.c 82e5db1013846a819f198336fed72c44c974e7b1
  F src/printf.c 2bc439ff20a4aad0e0ad50a37a67b5eae7d20edc
  F src/random.c ba2679f80ec82c4190062d756f22d0c358180696
- F src/resolve.c 2d47554370de8de6dd5be060cef9559eec315005
+ F src/resolve.c 7a67cd2aebc9a9eeecd1d104eb6a9237388eb452
  F src/rowset.c eccf6af6d620aaa4579bd3b72c1b6395d9e9fa1e
- F src/select.c 57ef3d98c4400b93eea318813be41b2af2da2217
- F src/shell.c e4ad9031072a6d679b2c69a780014d30db62dc7f
- F src/sqlite.h.in 52dce8a4cf52ae3201507a8f0f0c68603fc925fc
+ F src/select.c c46de38c1b66355f02a839bb72eb13f277e6d19c
 -F src/shell.c b1f91e60918df3a68efad1e3a11696b9a7e23d23
 -F src/sqlite.h.in 447ead0a6b3293206f04a0896553955d07cfb4b9
++F src/shell.c 534f332318f1cff781e07d82a952f22e644e8f6f
++F src/sqlite.h.in a25d949fd0714136d574e18738defa893baf14bb
  F src/sqlite3.rc 992c9f5fb8285ae285d6be28240a7e8d3a7f2bad
  F src/sqlite3ext.h a0b948ebc89bac13941254641326a6aa248c2cc4
- F src/sqliteInt.h d6389d1902f97533210c443f1cc77f83bd4bb73e
 -F src/sqliteInt.h 89e68539d645db597366a91411468b51e73c21a0
++F src/sqliteInt.h 198917e2122c33b43412efedc2b055a82a212225
  F src/sqliteLimit.h 216557999cb45f2e3578ed53ebefe228d779cb46
  F src/status.c f266ad8a2892d659b74f0f50cb6a88b6e7c12179
  F src/table.c 51b46b2a62d1b3a959633d593b89bab5e2c9155e
 -F src/tclsqlite.c d9439b6a910985b7fff43ba6756bcef00de22649
 +F src/tclsqlite.c e2344bee0d192397f555a24ef3fab26f2ed93bcc
- F src/test1.c ab312f4160fdd9c82e65e8b123e35ef17e879c07
+ F src/test1.c c12ed85c22ac95f87f79de2ec9553334d115f71e
  F src/test2.c 577961fe48961b2f2e5c8b56ee50c3f459d3359d
  F src/test3.c 64d2afdd68feac1bb5e2ffb8226c8c639f798622
  F src/test4.c d168f83cc78d02e8d35567bb5630e40dcd85ac1e
@@@ -404,22 -393,22 +412,22 @@@ F src/test_vfstrace.c bab9594adc976cbe6
  F src/test_wsd.c 41cadfd9d97fe8e3e4e44f61a4a8ccd6f7ca8fe9
  F src/threads.c 6bbcc9fe50c917864d48287b4792d46d6e873481
  F src/tokenize.c 57cb3720f53f84d811def2069c2b169b6be539a5
- F src/treeview.c c84b1a8ebc7f1d00cd76ce4958eeb3ae1021beed
+ F src/treeview.c c15df00728034549ff92d78ae851b44952736d3b
  F src/trigger.c 322f23aad694e8f31d384dcfa386d52a48d3c52f
 -F src/update.c 487747b328b7216bb7f6af0695d6937d5c9e605f
 +F src/update.c 24dd6a45b8b3470e62702128ebf11be1f2693145
  F src/utf.c fc6b889ba0779b7722634cdeaa25f1930d93820c
- F src/util.c 46358a204b35971a839341cf64599d65b151ba88
+ F src/util.c bc9dd64b5db544218b871b66243871c202b2781f
  F src/vacuum.c 2ddd5cad2a7b9cef7f9e431b8c7771634c6b1701
- F src/vdbe.c 8dbffc354f8b8bfb388d56c2e470a589fba0543c
 -F src/vdbe.c 6d85be995bd2308a5aa2a68c7b564c5d4cc1a6fb
 -F src/vdbe.h 7a75045d879118b9d3af7e8b3c108f2f27c51473
 -F src/vdbeInt.h 8b54e01ad0463590e7cffabce0bc36da9ee4f816
 -F src/vdbeapi.c bda74ef4b5103d7b4a4be36f936d3cf2b56a7d6f
 -F src/vdbeaux.c af2d86b2b114a106c94fc656503fc5c89594f5af
 -F src/vdbeblob.c 4f2e8e075d238392df98c5e03a64342465b03f90
 -F src/vdbemem.c ae38a0d35ae71cf604381a887c170466ba518090
++F src/vdbe.c 76304f37d020d217ee6cfd3ac632fb4e6fcddb26
 +F src/vdbe.h d0f8ab919146109d080cde4b0840af9b5fafad4b
 +F src/vdbeInt.h 963c87c4bf8040c0a316ca3e58f8a4888e1fa3c4
- F src/vdbeapi.c 7813b9725069c8b32e6da727bcf3e73f321384a4
- F src/vdbeaux.c 2d86fc5411e4e659c9181ef642c63dff602b3684
++F src/vdbeapi.c c58b0f5aab970e190b1047c4c6b74769381dcd04
++F src/vdbeaux.c 634a480aaec26e170b4fcfab91697f3cc6788ee8
 +F src/vdbeblob.c ab33f9b57cfce7dddb23853090186da614be4846
 +F src/vdbemem.c 6c9e261d135fc175da2f34e46d60243a19fffb9f
  F src/vdbesort.c f5009e7a35e3065635d8918b9a31f498a499976b
  F src/vdbetrace.c 8befe829faff6d9e6f6e4dee5a7d3f85cc85f1a0
- F src/vtab.c 082b35a25a26e3d36f365ca8cd73c1922532f05e
+ F src/vtab.c d31174e4c8f592febab3fa7f69e18320b4fd657a
  F src/vxworks.h c18586c8edc1bddbc15c004fa16aeb1e1342b4fb
  F src/wal.c 6fb6b68969e4692593c2552c4e7bff5882de2cb8
  F src/wal.h df01efe09c5cb8c8e391ff1715cca294f89668a4
@@@ -1351,10 -1341,10 +1361,10 @@@ F tool/mkopts.tcl 66ac10d240cc6e86abd37
  F tool/mkpragmatab.tcl 84af2b180484323a2ea22a2279e8bd9e3e1e492e
  F tool/mkspeedsql.tcl a1a334d288f7adfe6e996f2e712becf076745c97
  F tool/mksqlite3c-noext.tcl 87240b09c20042999b41d5fabe091b7111287835
 -F tool/mksqlite3c.tcl 421ecbd437d8cd7123e67430ee8146218396680d
 -F tool/mksqlite3h.tcl 44730d586c9031638cdd2eb443b801c0d2dbd9f8
 +F tool/mksqlite3c.tcl 038ed0aee939e6207c462727088a08d0bdf49a8c
 +F tool/mksqlite3h.tcl 96d92fcac21c6037d9db20c7cb2e06b534b550ac
  F tool/mksqlite3internalh.tcl eb994013e833359137eb53a55acdad0b5ae1049b
- F tool/mkvsix.tcl 3b58b9398f91c7dbf18d49eb87cefeee9efdbce1
+ F tool/mkvsix.tcl bbe57cd9ae11c6cc70319241101ef8d2b8c3765b
  F tool/offsets.c fe4262fdfa378e8f5499a42136d17bf3b98f6091
  F tool/omittest.tcl 34d7ac01fe4fd18e3637f64abe12c40eca0f6b97
  F tool/opcodeDoc.awk b3a2a3d5d3075b8bd90b7afe24283efdd586659c
@@@ -1375,18 -1365,19 +1385,18 @@@ F tool/speedtest2.tcl ee2149167303ba8e9
  F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
  F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
  F tool/split-sqlite3c.tcl d9be87f1c340285a3e081eb19b4a247981ed290c
- F tool/sqldiff.c 0748c0daed08f31e5a8eab6de98ca57500e61ecf
+ F tool/sqldiff.c b318efc2eaf7a7fac4d281a0ce736193cb2506df
  F tool/stack_usage.tcl f8e71b92cdb099a147dad572375595eae55eca43
  F tool/symbols-mingw.sh 4dbcea7e74768305384c9fd2ed2b41bbf9f0414d
 -F tool/symbols.sh fec58532668296d7c7dc48be9c87f75ccdb5814f
 +F tool/symbols.sh c5a617b8c61a0926747a56c65f5671ef8ac0e148
- F tool/tostr.awk e75472c2f98dd76e06b8c9c1367f4ab07e122d06
+ F tool/tostr.awk 11760e1b94a5d3dcd42378f3cc18544c06cfa576
  F tool/varint.c 5d94cb5003db9dbbcbcc5df08d66f16071aee003
  F tool/vdbe-compress.tcl 5926c71f9c12d2ab73ef35c29376e756eb68361c
  F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1
  F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
  F tool/warnings.sh 48bd54594752d5be3337f12c72f28d2080cb630b
  F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
- P 7f0ee77062d2fcb014942c7c62c163ccc801f21b cca79fdc3dff65907c2a59369057265b4512058f
- R afa7eed8a3a47b08d78c1d46aa2aac25
 -P bc577fe6cbbe5385d81d6fa0f3c34bb1c833f0d6 072279d458fbb74a812a9ee723041d6b7c662a88
 -R 945241c39c0e2b8c88fe2d95b8e90177
 -T +closed 072279d458fbb74a812a9ee723041d6b7c662a88
++P 0298a9a780695b666e7c683700d9f2f889d6f826 64d13339d44d1b7ec6768a33421f2138cb7872d8
++R 68454f4230fc116d30b90969f8a680d7
  U drh
- Z d3e71694cf71fedeea79c377e4fa2c08
 -Z 016c7dc0deb1c398804e42d942b63fbc
++Z c9e6b5cac5d4ca7f98b94a1f656dcb53

diff --cc manifest.uuid
index 6be0992b22f6495b5420356629f32f6b173294e2,cb7f7ee87d2628315afdcaf025eb0122619c21b8..7c89602550a983f8a9785eb97a940f7d49c95ccf
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 0298a9a780695b666e7c683700d9f2f889d6f826
 -64d13339d44d1b7ec6768a33421f2138cb7872d8
++e9196d566690de0e9815f8cd85be7844322b5a79

diff --cc src/insert.c
Simple merge

diff --cc src/main.c
Simple merge

diff --cc src/shell.c
Simple merge

diff --cc src/sqlite.h.in
Simple merge

diff --cc src/sqliteInt.h
Simple merge

diff --cc src/vdbe.c
Simple merge

diff --cc src/vdbeapi.c
Simple merge

diff --cc src/vdbeaux.c
Simple merge