From: drh <drh@noemail.net>
Date: Thu, 20 Aug 2015 23:45:59 +0000 (+0000)
Subject: Merge recent enhancements from trunk, including table-valued expressions.
X-Git-Tag: version-3.10.0~191^2~9
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c1bd84124b1877b6afcdf7229ed00aefcadc2860;p=thirdparty%2Fsqlite.git

Merge recent enhancements from trunk, including table-valued expressions.

FossilOrigin-Name: b9927c876c1d4e146cb6a603d82cd2489594084d
---

c1bd84124b1877b6afcdf7229ed00aefcadc2860
diff --cc manifest
index 1f849deb21,67a5b345e2..27b1b39c52
--- a/manifest
+++ b/manifest
@@@ -1,9 -1,9 +1,9 @@@
- C Provide\shints\sfor\sall\sterms\sin\sa\srange\sconstraint\sif\sthere\sare\sany\sequality\nterms\sanywhere\sin\sthe\sconstraint.\s\sRange\sconstraint\sterms\sare\sonly\somitted\nfor\sa\spure\srange\sconstraint\swith\sno\sequality\sprefix.
- D 2015-08-18T15:58:05.895
 -C Compiler-warning\sfixes\sin\sthe\ssqldiff.exe\sutility.
 -D 2015-08-20T23:33:09.816
++C Merge\srecent\senhancements\sfrom\strunk,\sincluding\stable-valued\sexpressions.
++D 2015-08-20T23:45:59.168
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
- F Makefile.in 2fc9ca6bf5949d415801c007ed3004a4bdb7c380
+ F Makefile.in 4f663b6b4954b9b1eb0e6f08387688a93b57542d
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
- F Makefile.msc 5f7861c62c41fe8e3205ef14b90ebed28fa21f1b
+ F Makefile.msc cf63e11a5395cf887515ac7b78e2057dfe442fcd
  F Makefile.vxworks e1b65dea203f054e71653415bd8f96dcaed47858
  F README.md 8ecc12493ff9f820cdea6520a9016001cb2e59b7
  F VERSION ccfc4d1576dbfdeece0a4372a2e6a2e37d3e7975
@@@ -277,17 -278,17 +278,17 @@@ F src/auth.c b56c78ebe40a2110fd361379f7
  F src/backup.c 4d9134dc988a87838c06056c89c0e8c4700a0452
  F src/bitvec.c d1f21d7d91690747881f03940584f4cc548c9d3d
  F src/btmutex.c 45a968cc85afed9b5e6cf55bf1f42f8d18107f79
 -F src/btree.c f48b3ef91676c06a90a8832987ecef6b94c931ee
 -F src/btree.h 969adc948e89e449220ff0ff724c94bb2a52e9f1
 +F src/btree.c b8083a37c09df6a30af497086d7ba05c1526d359
 +F src/btree.h 6310645beddbd3eef89fa9b6d1062065976a93c8
  F src/btreeInt.h 8177c9ab90d772d6d2c6c517e05bed774b7c92c0
- F src/build.c 4acc35c4e0a2d94c906abd164568cd6fc989cfbb
+ F src/build.c 5eb5d055a1d1cdaaea25e01b12607aa894bc0911
  F src/callback.c 7b44ce59674338ad48b0e84e7b72f935ea4f68b0
  F src/complete.c addcd8160b081131005d5bc2d34adf20c1c5c92f
  F src/ctime.c 5a0b735dc95604766f5dac73973658eef782ee8b
  F src/date.c 8ec787fed4929d8ccdf6b1bc360fccc3e1d2ca58
  F src/dbstat.c f402e77e25089c6003d0c60b3233b9b3947d599a
  F src/delete.c 8857a6f27560718f65d43bdbec86c967ae1f8dfa
- F src/expr.c e1fc69ce92a27bbb8074db56eece7914393b3ef6
 -F src/expr.c 9b9fa7f825290dee945007edc9fe8fdd9b8ce49e
++F src/expr.c 673b80a52bbd6baedef15353c22facc436634fe8
  F src/fault.c 160a0c015b6c2629d3899ed2daf63d75754a32bb
  F src/fkey.c c9b63a217d86582c22121699a47f22f524608869
  F src/func.c 824bea430d3a2b7dbc62806ad54da8fdb8ed9e3f
@@@ -333,14 -334,14 +334,14 @@@ 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 00acffc2e87904d9be0ac8e0fa365fd3326fa6fc
 -F src/select.c c46de38c1b66355f02a839bb72eb13f277e6d19c
++F src/select.c 4f276673f843f80e4db710556fefcede84527b86
  F src/shell.c b1f91e60918df3a68efad1e3a11696b9a7e23d23
  F src/sqlite.h.in 447ead0a6b3293206f04a0896553955d07cfb4b9
  F src/sqlite3.rc 992c9f5fb8285ae285d6be28240a7e8d3a7f2bad
  F src/sqlite3ext.h a0b948ebc89bac13941254641326a6aa248c2cc4
- F src/sqliteInt.h cbd6d166c5f8aa17e4be463ccefef41cd1d40286
 -F src/sqliteInt.h 89e68539d645db597366a91411468b51e73c21a0
++F src/sqliteInt.h 58bae1ab01e341359e0674a6e45304eb07c0c460
  F src/sqliteLimit.h 216557999cb45f2e3578ed53ebefe228d779cb46
  F src/status.c f266ad8a2892d659b74f0f50cb6a88b6e7c12179
  F src/table.c 51b46b2a62d1b3a959633d593b89bab5e2c9155e
@@@ -398,11 -399,11 +399,11 @@@ F src/update.c 487747b328b7216bb7f6af06
  F src/utf.c fc6b889ba0779b7722634cdeaa25f1930d93820c
  F src/util.c bc9dd64b5db544218b871b66243871c202b2781f
  F src/vacuum.c 2ddd5cad2a7b9cef7f9e431b8c7771634c6b1701
- F src/vdbe.c 4dbcceb38f5c3e42c0725a56e7c76eb12adedebb
 -F src/vdbe.c 6d85be995bd2308a5aa2a68c7b564c5d4cc1a6fb
 -F src/vdbe.h 7a75045d879118b9d3af7e8b3c108f2f27c51473
 -F src/vdbeInt.h 8b54e01ad0463590e7cffabce0bc36da9ee4f816
++F src/vdbe.c 9d85fa72a73f7f07789d76602f724be63e998ddc
 +F src/vdbe.h 529bb4a7bedcd28dccba5abb3927e3c5cb70a832
 +F src/vdbeInt.h 7258d75fc2dad0bccdef14d7d8d2fd50fd1bf2d2
- F src/vdbeapi.c adabbd66eb2e3a10f3998485ee0be7e326d06ee4
- F src/vdbeaux.c e8dbcc838ca29f0d2767e789f4fe5883541e4f6e
+ F src/vdbeapi.c bda74ef4b5103d7b4a4be36f936d3cf2b56a7d6f
 -F src/vdbeaux.c af2d86b2b114a106c94fc656503fc5c89594f5af
++F src/vdbeaux.c 2262c5a674a30279f666061dd6b86f147df0d4b5
  F src/vdbeblob.c 4f2e8e075d238392df98c5e03a64342465b03f90
  F src/vdbemem.c ae38a0d35ae71cf604381a887c170466ba518090
  F src/vdbesort.c f5009e7a35e3065635d8918b9a31f498a499976b
@@@ -411,11 -412,11 +412,11 @@@ F src/vtab.c d31174e4c8f592febab3fa7f69
  F src/vxworks.h c18586c8edc1bddbc15c004fa16aeb1e1342b4fb
  F src/wal.c 6fb6b68969e4692593c2552c4e7bff5882de2cb8
  F src/wal.h df01efe09c5cb8c8e391ff1715cca294f89668a4
- F src/walker.c c253b95b4ee44b21c406e2a1052636c31ea27804
- F src/where.c ef95e56b6e7cdfa3ae0b6f72e3578391addfa965
- F src/whereInt.h 5f87e3c4b0551747d119730dfebddd3c54f04047
- F src/wherecode.c ec90321e51bd13a0396f305403bc8ced2af7407e
- F src/whereexpr.c 9ce1c9cfedbf80c93c7d899497025ec8256ce652
+ F src/walker.c 2e14d17f592d176b6dc879c33fbdec4fbccaa2ba
 -F src/where.c 66518a14a1238611aa0744d6980b6b7f544f4816
++F src/where.c 746317b80f377aafbfb6c5e01366dedc38e1255b
+ F src/whereInt.h 880a8599226ac1c00203490d934f3ed79b292572
 -F src/wherecode.c 69f19535a6de0cceb10e16b31a3a03463e31bc24
++F src/wherecode.c 3be7fd91b356fad4379ad1cc98929e22c19c1acb
+ F src/whereexpr.c f9dbd159127452150c92b558e184827ecb8f9229
  F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2
  F test/affinity2.test a6d901b436328bd67a79b41bb0ac2663918fe3bd
  F test/aggerror.test a867e273ef9e3d7919f03ef4f0e8c0d2767944f2
@@@ -1374,7 -1376,8 +1377,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 142b048ac778620dd4e448c2e969982eb8188501
- R e232e29543e31c41650c4e43b7879d83
 -P bc577fe6cbbe5385d81d6fa0f3c34bb1c833f0d6 072279d458fbb74a812a9ee723041d6b7c662a88
 -R 945241c39c0e2b8c88fe2d95b8e90177
 -T +closed 072279d458fbb74a812a9ee723041d6b7c662a88
++P b5897bc0f003c470eeb2a75e0a2b2bb202681531 64d13339d44d1b7ec6768a33421f2138cb7872d8
++R 9b0937bd5d11dff99a3e5d1003be4f97
  U drh
- Z 6f609828180274045282332efd8f8026
 -Z 016c7dc0deb1c398804e42d942b63fbc
++Z 8c2c018336c0b229ac2e1ad26fa5ec97
diff --cc manifest.uuid
index c4758539e8,cb7f7ee87d..ef28417b4c
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- b5897bc0f003c470eeb2a75e0a2b2bb202681531
 -64d13339d44d1b7ec6768a33421f2138cb7872d8
++b9927c876c1d4e146cb6a603d82cd2489594084d