]> git.ipfire.org Git - thirdparty/sqlite.git/commitdiff
Merge in the 3.8.10 release changes.
authordrh <drh@noemail.net>
Thu, 7 May 2015 12:29:54 +0000 (12:29 +0000)
committerdrh <drh@noemail.net>
Thu, 7 May 2015 12:29:54 +0000 (12:29 +0000)
FossilOrigin-Name: 0404ef885e47f0df1daa04feb28452beb4d32a35

1  2 
manifest
manifest.uuid
src/vdbe.c

diff --cc manifest
index 9d80d5aa8389fa83cd63300070833524856bcfa5,b7d0b1b60ec27dd309942111664584c25af281d7..09d68aa497d399f9b10b5c7f289a0f0989cf0141
+++ b/manifest
@@@ -1,9 -1,9 +1,9 @@@
- C Merge\sall\strunk\senhancements\sand\sfixes\sinto\sthe\ssessions\sbranch.
- D 2015-05-05T17:12:27.092
 -C Version\s3.8.10
 -D 2015-05-07T11:53:08.287
++C Merge\sin\sthe\s3.8.10\srelease\schanges.
++D 2015-05-07T12:29:54.271
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 -F Makefile.in 08728ecbeddca339c77bfd564d3484b523dffdb1
 +F Makefile.in 114f5809eeff63855cfda99551addf1e00ef7730
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
 -F Makefile.msc c6241f7fa2912427410ef15429c8ab5601e19a71
 +F Makefile.msc 6b0b04b6037ef272e8c1f2a24ccc0f99663dde14
  F Makefile.vxworks e1b65dea203f054e71653415bd8f96dcaed47858
  F README.md d58e3bebc0a4145e0f2a87994015fdb575a8e866
  F VERSION 2e244662b71e6e68a5c29b014ebc5b7564f4cc5a
@@@ -199,8 -181,8 +199,8 @@@ F src/callback.c 7b44ce59674338ad48b0e8
  F src/complete.c a5cf5b4b56390cfb7b8636e8f7ddef90258dd575
  F src/ctime.c 98f89724adc891a1a4c655bee04e33e716e05887
  F src/date.c e4d50b3283696836ec1036b695ead9a19e37a5ac
- F src/dbstat.c 1eacd310212b5ae59b7be645a06de8f8bbe0b5d6 w src/test_stat.c
+ F src/dbstat.c 1eacd310212b5ae59b7be645a06de8f8bbe0b5d6
 -F src/delete.c 37964e6c1d73ff49cbea9ff690c9605fb15f600e
 +F src/delete.c 5075d88557eb4e2a7fdb2b61a96142830d8589b8
  F src/expr.c 3fb2ab3ab69d15b4b75ae53fceb4e317f64cb306
  F src/fault.c 160a0c015b6c2629d3899ed2daf63d75754a32bb
  F src/fkey.c c9b63a217d86582c22121699a47f22f524608869
@@@ -245,16 -227,16 +245,16 @@@ F src/pcache1.c 69d137620a305f814398bd2
  F src/pragma.c c1f4d012ea9f6b1ce52d341b2cd0ad72d560afd7
  F src/pragma.h 09c89bca58e9a44de2116cc8272b8d454657129f
  F src/prepare.c 1fffbdcd6f8a0173a8f70d71f22528f4c0e1e3d3
- F src/printf.c 1f87c24770b2cea3fadbec03bfb6bdcbd353802c
+ F src/printf.c 54dd6dce95454fadffa3ebf7717c5f6c06250d1d
  F src/random.c ba2679f80ec82c4190062d756f22d0c358180696
- F src/resolve.c 13109bc3b5ab404446296efa17039640de5bc35d
+ F src/resolve.c 99eabf7eff0bfa65b75939b46caa82e2b2133f28
  F src/rowset.c eccf6af6d620aaa4579bd3b72c1b6395d9e9fa1e
  F src/select.c 1b0bfc7d59e48c26b895a6b719157111a617d9e3
 -F src/shell.c 1b6fc902d4455b7a4d6d9cc9a23d3f6af7089302
 -F src/sqlite.h.in ca27603a36fcacdaac5a19d8ee35aaff8ce8516f
 +F src/shell.c a781037a81ac801495e06855605b444a8c5bd19b
 +F src/sqlite.h.in 679a3abfef9c13a989728fd27f308a3e3f00e232
  F src/sqlite3.rc 992c9f5fb8285ae285d6be28240a7e8d3a7f2bad
  F src/sqlite3ext.h 17d487c3c91b0b8c584a32fbeb393f6f795eea7d
 -F src/sqliteInt.h 20d9c59fd82774503b8953acfbcc6ecbdd9ee6aa
 +F src/sqliteInt.h 15960c3f5f682abb9ac1664c6bd9146d18d3f21d
  F src/sqliteLimit.h 216557999cb45f2e3578ed53ebefe228d779cb46
  F src/status.c f266ad8a2892d659b74f0f50cb6a88b6e7c12179
  F src/table.c 51b46b2a62d1b3a959633d593b89bab5e2c9155e
@@@ -311,13 -293,13 +311,13 @@@ F src/update.c d207deb7a031f698104bee87
  F src/utf.c fc6b889ba0779b7722634cdeaa25f1930d93820c
  F src/util.c a6431c92803b975b7322724a7b433e538d243539
  F src/vacuum.c 2ddd5cad2a7b9cef7f9e431b8c7771634c6b1701
- F src/vdbe.c 9d202ac3b0c99c355ba0b0a6972320687809ebb0
 -F src/vdbe.c d437887d02d13d79dc69ac018f788aefac3b3972
 -F src/vdbe.h 7e538ecf47dccb307ea2d087c3ddc2dd8d70e79d
 -F src/vdbeInt.h 9cbaa84f53ddd2d09a0cf61a94337a3a035d08a0
 -F src/vdbeapi.c 583d56b129dd27f12bed518270de9ebe521e6a75
 -F src/vdbeaux.c 03591cca98ec50e1493043f0ff7abbece0b9c83d
 -F src/vdbeblob.c 4f2e8e075d238392df98c5e03a64342465b03f90
 -F src/vdbemem.c 7bfbeef0978a2e1a05d979641fdbf7c189b7ddf4
++F src/vdbe.c f3033cd2b37e730574cc1865d2ba73766d768065
 +F src/vdbe.h 01d8c35cb877faca74331bb690f0327493c2cb50
 +F src/vdbeInt.h 96e4303a96c6f983e36e1fe32657b2c547f5c8f1
 +F src/vdbeapi.c d95f2bb43d01a91d93231cde181811b38182202e
 +F src/vdbeaux.c 4ccd9105cca5c2cbc0481034fd468e3aa184f48f
 +F src/vdbeblob.c ab33f9b57cfce7dddb23853090186da614be4846
 +F src/vdbemem.c eda55a13cfaa797f89ef243a129f3f5a457719e7
  F src/vdbesort.c f5009e7a35e3065635d8918b9a31f498a499976b
  F src/vdbetrace.c 8befe829faff6d9e6f6e4dee5a7d3f85cc85f1a0
  F src/vtab.c c535e80259ebe616467181a83a4263555b97c694
@@@ -1275,7 -1256,10 +1275,7 @@@ F tool/vdbe_profile.tcl 67746953071a9f8
  F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
  F tool/warnings.sh 0abfd78ceb09b7f7c27c688c8e3fe93268a13b32
  F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
- P aada0ad08e3baa10d14d1f3393183110289e068e cc50883d67334507227e1384fef6cc7c93fd7de1
- R 57a34e2e8eeec13ac380555b67cfa4b9
 -P 5f2539da8cb9df99029ab4ab7023804722697673
 -R 014968d54fc9fdc23120a39f420a5f8f
 -T +bgcolor * #d0c0ff
 -T +sym-release *
 -T +sym-version-3.8.10 *
++P de7083cfe2bb00b689bec6bcc75e994f564ceda6 cf975957b9ae671f34bb65f049acf351e650d437
++R 2f55d0a58047aedd7e79d4671acd0f99
  U drh
- Z 93aac8a32e2cf8ebfa942b5cc002f02e
 -Z 6270ca72fe7be4337004b813fe656c7c
++Z 12d4e95f1926699d9a88cac43c727452
diff --cc manifest.uuid
index 0ec95b518f1e6d074333b6e792b094d7db2e791b,8e4d2fce57d9e24b40374479e2723b8d7ed7d769..fab289e196826fe260d2a7bc357d40ff297fa2d5
@@@ -1,1 -1,1 +1,1 @@@
- de7083cfe2bb00b689bec6bcc75e994f564ceda6
 -cf975957b9ae671f34bb65f049acf351e650d437
++0404ef885e47f0df1daa04feb28452beb4d32a35
diff --cc src/vdbe.c
Simple merge