]> git.ipfire.org Git - thirdparty/sqlite.git/commitdiff
Merge recent enhancements from trunk. Version now 3.9.1.
authordrh <drh@noemail.net>
Fri, 16 Oct 2015 20:53:57 +0000 (20:53 +0000)
committerdrh <drh@noemail.net>
Fri, 16 Oct 2015 20:53:57 +0000 (20:53 +0000)
FossilOrigin-Name: 26fa091d68e89a0b6af61ba706d23a9f37e8025a

1  2 
manifest
manifest.uuid
src/expr.c
src/select.c
src/sqliteInt.h
src/vdbe.c
src/vdbeInt.h
src/vdbeaux.c
src/wherecode.c

diff --cc manifest
index c234b17ae3299ee94713e2d2894a4c2fc74b0fca,d339fd779d396affc5e3544ba3ba332c689d74f7..17763a19f4ef513cc11f2d083b9873224cc10472
+++ b/manifest
@@@ -1,10 -1,10 +1,10 @@@
- C Merge\sin\sall\sthe\s3.9.0\supdates\sfrom\strunk.
- D 2015-10-14T20:09:54.505
 -C Enhancements\sto\sthe\sMSVC\smakefile.
 -D 2015-10-16T20:13:57.036
++C Merge\srecent\senhancements\sfrom\strunk.\s\sVersion\snow\s3.9.1.
++D 2015-10-16T20:53:57.452
  F Makefile.in 2ea961bc09e441874eb3d1bf7398e04feb24f3ee
  F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
- F Makefile.msc 9660c072f65b2742595687b30f6d9ae55001ae06
+ F Makefile.msc 4eb750e0fdf52050a06d881e1b060f4bb116ed7e
  F README.md 8ecc12493ff9f820cdea6520a9016001cb2e59b7
- F VERSION cacf16a72f9a03cd06b939a764e32f6f53254c7f
+ F VERSION a47917b59f38b632b3a8662d14fd20f94956bdd0
  F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
  F art/sqlite370.eps aa97a671332b432a54e1d74ff5e8775be34200c2
  F art/sqlite370.ico af56c1d00fee7cd4753e8631ed60703ed0fc6e90
@@@ -290,7 -290,7 +290,7 @@@ F src/ctime.c 509ef9c64d1321f42448f111d
  F src/date.c fb1c99172017dcc8e237339132c91a21a0788584
  F src/dbstat.c e637e7a7ff40ef32132a418c6fdf1cfb63aa27c7
  F src/delete.c 35c939eb8bacc9dd8a6715964e5f69feb8c20e44
- F src/expr.c 7afc6450c3da35127f2ffe8b0412962c46cc0fa6
 -F src/expr.c e8765542b21bc7ff801ca82d5cf11f0b13a219af
++F src/expr.c 41c83c44758eba4c2bac868090346ce69d2f2dd7
  F src/fault.c 160a0c015b6c2629d3899ed2daf63d75754a32bb
  F src/fkey.c 31900763094a3736a5fc887469202eb579fef2d0
  F src/func.c ecdd69ec6a1e406f04cc73324be2ebbf6354197f
@@@ -338,14 -338,14 +338,14 @@@ F src/printf.c 0c4bcdd1c2e2521024f0a69c
  F src/random.c ba2679f80ec82c4190062d756f22d0c358180696
  F src/resolve.c 1954a0f01bf65d78d7d559aea3d5c67f33376d91
  F src/rowset.c eccf6af6d620aaa4579bd3b72c1b6395d9e9fa1e
- F src/select.c 3e4a4691e11d810b024407d90aa5dd845b1f5aac
 -F src/select.c dbf1fb82317043304da334a33206add211487f96
++F src/select.c 167b4e9058bc8e997d18d6b6b20ecbb0c9c457af
  F src/shell.c d25df04168d6ba5a4fa05bdbf859df667f9eb621
- F src/sqlite.h.in dc35357824c6bb84a04acd4e99dee3e07299a8c6
+ F src/sqlite.h.in 839c818e16ea68703d90d17bd2bb3607191debce
  F src/sqlite3.rc 992c9f5fb8285ae285d6be28240a7e8d3a7f2bad
  F src/sqlite3ext.h 4b66e3e3435da4b4c8c83696d0349f0c503b3924
- F src/sqliteInt.h d2d529e342d5becf735ca2edde2ba1477c935d45
 -F src/sqliteInt.h 1ad779ee62efee60494af0a75d8d45592f9f53c3
++F src/sqliteInt.h af76837cad8fb696e6527ec2745f175de7cb9093
  F src/sqliteLimit.h 216557999cb45f2e3578ed53ebefe228d779cb46
- F src/status.c f266ad8a2892d659b74f0f50cb6a88b6e7c12179
+ F src/status.c 286f6398a4d2cd1e8ff0771e3d30f8dddb4768ea
  F src/table.c 51b46b2a62d1b3a959633d593b89bab5e2c9155e
  F src/tclsqlite.c d9439b6a910985b7fff43ba6756bcef00de22649
  F src/test1.c 8fff9c5aa63d6490f516d018b70c12a9cb9a4d8a
@@@ -401,23 -401,23 +401,23 @@@ F src/update.c aa10336a2719bd1b9f89004f
  F src/utf.c fc6b889ba0779b7722634cdeaa25f1930d93820c
  F src/util.c fc612367108b74573c5fd13a85d0a23027f438bd
  F src/vacuum.c 2ddd5cad2a7b9cef7f9e431b8c7771634c6b1701
- F src/vdbe.c 4d4d88a68c354a62e8d4d3fffa365397e532374d
 -F src/vdbe.c e9315575bed64f9aa559151283c873be34143914
 -F src/vdbe.h 4bc88bd0e06f8046ee6ab7487c0015e85ad949ad
 -F src/vdbeInt.h 777dd76d513347acb1a71d94df2be00516add637
++F src/vdbe.c 10d66354fec90acb5fc908ad36da404ef9796170
 +F src/vdbe.h efb7a8c1459e31f3ea4377824c6a7e4cb5068637
- F src/vdbeInt.h c1508eb4ee04d4db7bdfca5620cfa8ad632fdd62
++F src/vdbeInt.h 33403622c6a8feaaac5f0f3f17f5d1bf6df42286
  F src/vdbeapi.c 020681b943e77766b32ae1cddf86d7831b7374ca
- F src/vdbeaux.c 7dccd114c9ee5f801709daecee36464fe6ce71af
 -F src/vdbeaux.c 906bc74ea90707b57a23e4264727fff7b48d0cb5
++F src/vdbeaux.c 717bc2ae9cc0b58ef398fff44bd9164bfd96772a
  F src/vdbeblob.c 565fabd302f5fca3bdf3d56cac330483616a39b6
- F src/vdbemem.c 19b3036aa4d676e7103b0fb5efd6327da455f915
- F src/vdbesort.c f5009e7a35e3065635d8918b9a31f498a499976b
+ F src/vdbemem.c fdd1578e47bea61390d472de53c565781d81e045
+ F src/vdbesort.c 8b23930a1289526f6d2a3a9f2e965bcc963e4a68
  F src/vdbetrace.c 8befe829faff6d9e6f6e4dee5a7d3f85cc85f1a0
  F src/vtab.c 2a8b44aa372c33f6154208e7a7f6c44254549806
  F src/vxworks.h c18586c8edc1bddbc15c004fa16aeb1e1342b4fb
  F src/wal.c 18b0ed49830cf04fe2d68224b41838a73ac6cd24
  F src/wal.h df01efe09c5cb8c8e391ff1715cca294f89668a4
  F src/walker.c 2e14d17f592d176b6dc879c33fbdec4fbccaa2ba
 -F src/where.c 4c4646675e794ac71e701289edefd7cd81bac844
 +F src/where.c 05a178b78c835928d7037c0b2e409b7b656a68a4
  F src/whereInt.h 7892bb54cf9ca0ae5c7e6094491b94c9286dc647
- F src/wherecode.c 4d60b2e8a88adb35851201fa4eff6fbf9aa57ad6
 -F src/wherecode.c b924b78acd9e623fb69bfa2cb65cd7d542166dd3
++F src/wherecode.c 9aa2043685ec3eb73e87fa6f50aa4ec092f197dd
  F src/whereexpr.c e63244ca06c503e5f3c5b7f3c9aea0db826089ed
  F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2
  F test/affinity2.test a6d901b436328bd67a79b41bb0ac2663918fe3bd
@@@ -1392,7 -1391,7 +1392,7 @@@ F tool/vdbe_profile.tcl 246d0da094856d7
  F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
  F tool/warnings.sh 48bd54594752d5be3337f12c72f28d2080cb630b
  F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
- P fbe637620fb7f2c9395c9ddac77d26746d6d4178 4bd0d43db7c1877f2d8a8d2f2a48f24a10f0c3b8
- R 95393720801ae9935a00efdbdde27bba
 -P eb2317429fc3fc81ccd92e6f84f873585829259d
 -R c8195ddfd54e61d102ea2ab84cfcbce4
 -U mistachkin
 -Z 0b9815ef53884597c48f7e60955b08c9
++P 29444149342fc6b1ea8cd34c2c8e1fcb06eaa7ed 39e8a5d93fa370afb03223bf0c20ea0f3448b9fc
++R 65f1893d9bc2d803f33dd71113ac3287
 +U drh
- Z 98cfd2338cc7382cd129bb1eb7f3da88
++Z c857f56fb460d2406ff0431b8f8cb27b
diff --cc manifest.uuid
index 1d90e1ad2ebf2a34c7457751ab79f6ab24a47690,2d3dfc6c5df22dafffe1b75c97e62d28ea79b40c..26dbcd2e8d68af6783c93639bc50f3f3b321f6df
@@@ -1,1 -1,1 +1,1 @@@
- 29444149342fc6b1ea8cd34c2c8e1fcb06eaa7ed
 -39e8a5d93fa370afb03223bf0c20ea0f3448b9fc
++26fa091d68e89a0b6af61ba706d23a9f37e8025a
diff --cc src/expr.c
Simple merge
diff --cc src/select.c
Simple merge
diff --cc src/sqliteInt.h
Simple merge
diff --cc src/vdbe.c
Simple merge
diff --cc src/vdbeInt.h
Simple merge
diff --cc src/vdbeaux.c
Simple merge
diff --cc src/wherecode.c
Simple merge