]> git.ipfire.org Git - thirdparty/sqlite.git/commitdiff
Merge latest trunk changes with this branch.
authordan <dan@noemail.net>
Mon, 11 Apr 2016 18:50:25 +0000 (18:50 +0000)
committerdan <dan@noemail.net>
Mon, 11 Apr 2016 18:50:25 +0000 (18:50 +0000)
FossilOrigin-Name: ffc62af1d503c6e7fc0059d9c2ee57a3bef9dd32

1  2 
manifest
manifest.uuid

diff --cc manifest
index 58157eb4f098a611dfe48bee36337ee7ce4062c5,464ea61dc8f28cf9dac58beb20a7042bf7526670..d5aafb59c4c6e9aa35ee0117d012d59a9d01cd60
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Add\sextra\stests\sto\stemptable2.test.
- D 2016-04-11T18:49:37.527
 -C Performance\soptimization\sfor\sthe\ssqlite3ExprListDelete()\sroutine.
 -D 2016-04-11T18:25:05.809
++C Merge\slatest\strunk\schanges\swith\sthis\sbranch.
++D 2016-04-11T18:50:25.500
  F Makefile.in eba680121821b8a60940a81454316f47a341487a
  F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
  F Makefile.msc 1f123a0757f6f04f0341accb46457e116817159a
@@@ -362,10 -362,10 +362,10 @@@ F src/os_setup.h c9d4553b5aaa6f73391448
  F src/os_unix.c bde4844f0849cab5924c6a81178f8500774ce76b
  F src/os_win.c b3ba9573d8d893e70a6a8015bbee572ecf7ffbef
  F src/os_win.h eb7a47aa17b26b77eb97e4823f20a00b8bda12ca
 -F src/pager.c 38718a019ca762ba4f6795425d5a54db70d1790d
 +F src/pager.c 4cc8a5b3979db65725eaa03650a6d54219122b8d
  F src/pager.h e1d38a2f14849e219df0f91f8323504d134c8a56
- F src/parse.y 52cdeb4f37634d0ccd2998aab099b7bbb690b0d3
+ F src/parse.y 10eb2f3fb62341291528c7984498054731f9d31e
 -F src/pcache.c 647bb53a86b7bbcf55ad88089b3ea5a9170b90df
 +F src/pcache.c e9c00846d3dcdaa75b288c6f16238c2fe2177823
  F src/pcache.h 4d0ccaad264d360981ec5e6a2b596d6e85242545
  F src/pcache1.c c40cdb93586e21b5dd826b5e671240bd91c26b05
  F src/pragma.c faf42922bb7ab2f6672cb550356c1967abae3c84
@@@ -1484,7 -1482,7 +1484,7 @@@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a9
  F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
  F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
  F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
- P 4eb06e843af60d5e533793618c6e0e9b7ef7a1a6
- R d2dfbf56b62d35c4cf496af1896eae37
 -P e35b345cf858018ae0c07f79725f8d58062168db
 -R 042d362729c0d167c05760c4bdfc93ba
 -U drh
 -Z 1727510a3b08bf1e72294ab7bbf28d3f
++P 7dd9d4c15bb6b6ef9127dc7c80a189c55e714dc9 2764aeaa11f38cf2ff4d6191e6d5466ddb203022
++R 7b4c1f71edaf782a86682a72496a355b
 +U dan
- Z db78b11117984d67b6a3aa7fe90754f9
++Z 4c9d4d3f9ec993332df2230efd24eb4f
diff --cc manifest.uuid
index 66abf69ec285fd66af69f31dc7d9339631c77eeb,ffdef1a3982d9f0f0c3aa1ecfc3f79fb96b0fde4..0dd130d179be3d449cc1df1ea1b707dcbf089797
@@@ -1,1 -1,1 +1,1 @@@
- 7dd9d4c15bb6b6ef9127dc7c80a189c55e714dc9
 -2764aeaa11f38cf2ff4d6191e6d5466ddb203022
++ffc62af1d503c6e7fc0059d9c2ee57a3bef9dd32