]> git.ipfire.org Git - thirdparty/sqlite.git/commitdiff
Update the sessions branch to the latest 3.7.17 beta.
authordrh <drh@noemail.net>
Fri, 17 May 2013 10:58:08 +0000 (10:58 +0000)
committerdrh <drh@noemail.net>
Fri, 17 May 2013 10:58:08 +0000 (10:58 +0000)
FossilOrigin-Name: af8057ef5dcaa72dc0d2ab5d1553b06757449fa1

1  2 
Makefile.in
Makefile.msc
manifest
manifest.uuid
src/main.c
test/permutations.test

diff --cc Makefile.in
Simple merge
diff --cc Makefile.msc
Simple merge
diff --cc manifest
index d001bf5a8a458042e10130d173ea1263f229bb9a,1b565863122117ee861fd4685c0608f99755cf02..07a9d62b1ec3ab975ee42d53843fbbdd762d832e
+++ b/manifest
@@@ -1,12 -1,12 +1,12 @@@
- C Update\sthe\ssessions\sbranch\swith\sthe\slatest\strunk\schanges.
- D 2013-05-15T18:45:14.080
 -C Fix\sminor\stest\sscript\sissues\scausing\sreleasetest.tcl\sto\sfail.
 -D 2013-05-16T19:15:07.754
++C Update\sthe\ssessions\sbranch\sto\sthe\slatest\s3.7.17\sbeta.
++D 2013-05-17T10:58:08.155
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
- F Makefile.in e2acdd75b30e5f2fd8739c923c746d9d2228fe9a
 -F Makefile.in f6b58b7bdf6535f0f0620c486dd59aa4662c0b4f
++F Makefile.in e4039bf51ba64e20375b375044a6582f4c27743a
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
- F Makefile.msc af9891d1f609607a54524f4ccabcbe5c38e4a8e3
 -F Makefile.msc 5dc042f51187414d5886ac6d8308630d484690c4
++F Makefile.msc bcba918c1bd4c9ba3d90d59954f8107ed1ffb5fb
  F Makefile.vxworks db21ed42a01d5740e656b16f92cb5d8d5e5dd315
  F README cd04a36fbc7ea56932a4052d7d0b7f09f27c33d6
 -F VERSION 05c7bd63b96f31cfdef5c766ed91307ac121f5aa
 +F VERSION 0dee4d2e0c64791ff0085277424fb5c07d79fc9a
  F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
  F addopcodes.awk 17dc593f791f874d2c23a0f9360850ded0286531
  F art/sqlite370.eps aa97a671332b432a54e1d74ff5e8775be34200c2
@@@ -172,7 -160,7 +172,7 @@@ F src/journal.c b4124532212b6952f42eb2c
  F src/legacy.c 0df0b1550b9cc1f58229644735e317ac89131f12
  F src/lempar.c cdf0a000315332fc9b50b62f3b5e22e080a0952b
  F src/loadext.c c48f7f3f170e502fe0cc20748e03c6e0b5a016c2
- F src/main.c 393460eeb03d98f52863c1def596f988b33fe2a1
 -F src/main.c c6419ef57392b1aa0cf6ed9c80dfc06b153fe299
++F src/main.c 457e5db78d5ed7c6ca776c9dae3d1a36be224ec9
  F src/malloc.c fe085aa851b666b7c375c1ff957643dc20a04bf6
  F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
  F src/mem1.c 437c7c4af964895d4650f29881df63535caaa1fa
@@@ -212,8 -200,8 +212,8 @@@ F src/sqliteInt.h 2b53aa18b83979ea2a63e
  F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d
  F src/status.c bedc37ec1a6bb9399944024d63f4c769971955a9
  F src/table.c 2cd62736f845d82200acfa1287e33feb3c15d62e
 -F src/tclsqlite.c 2ecec9937e69bc17560ad886da35195daa7261b8
 +F src/tclsqlite.c c21f61c56d519b4bcc0dcf453953edba69266854
- F src/test1.c ab9dd4fc486a2542f57a2ca17d74fc7f28dfd05a
+ F src/test1.c 045d45a4f7eeb5d963f8fc150339f1bad279011a
  F src/test2.c 7355101c085304b90024f2261e056cdff13c6c35
  F src/test3.c 1c0e5d6f080b8e33c1ce8b3078e7013fdbcd560c
  F src/test4.c 9b32d22f5f150abe23c1830e2057c4037c45b3df
@@@ -690,7 -679,7 +691,7 @@@ F test/pageropt.test 6b8f6a123a5572c195
  F test/pagesize.test 1dd51367e752e742f58e861e65ed7390603827a0
  F test/pcache.test 065aa286e722ab24f2e51792c1f093bf60656b16
  F test/pcache2.test a83efe2dec0d392f814bfc998def1d1833942025
- F test/permutations.test 1981ef401ecd5292058c19ee10c94aa17c9039fd
 -F test/permutations.test d997a947ab8aabb15f763d50a030b3c11e8ef1b6
++F test/permutations.test 40df92601e0874e8026c7fdb50609b095f9f05a9
  F test/pragma.test 5e7de6c32a5d764f09437d2025f07e4917b9e178
  F test/pragma2.test 3a55f82b954242c642f8342b17dffc8b47472947
  F test/printf.test ec9870c4dce8686a37818e0bf1aba6e6a1863552
@@@ -1077,7 -1065,7 +1078,7 @@@ F tool/vdbe-compress.tcl f12c884766bd14
  F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
  F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
  F tool/win/sqlite.vsix 97894c2790eda7b5bce3cc79cb2a8ec2fde9b3ac
- P 512f8a1ef8c4cf50723cfc4a78b7370dc37358d9 867b3e3b29a357f68e48f0898bf323c5dd0575a4
- R ffa29f370c90d286799404471155a28b
 -P 8ffbefe7d72d25984440c0e7c92a5e9c472ed55e
 -R f07a18b2e3f935e06c563a062973d3d2
 -U dan
 -Z d6b0c0831a8f288a82efe390e3410800
++P d09355050a74344c1cb6d303af9f601cd41e2368 d8ded9d8a1052885ce223c70efa55c0dd8b9920e
++R c12e481b3224058e66a57aeacd5736f1
 +U drh
- Z 1d96d56a3ef3c0775b8112327033ec85
++Z 31d78d7c8b7ae32611c6950904cdb647
diff --cc manifest.uuid
index bc304b83ee5162cd5b256d074d763c94415b0e6d,fa5f59ce9998a2be886b00e0b09570da10f77159..ed06f3c58a17561f4c91ad6cd117c7901484ac42
@@@ -1,1 -1,1 +1,1 @@@
- d09355050a74344c1cb6d303af9f601cd41e2368
 -d8ded9d8a1052885ce223c70efa55c0dd8b9920e
++af8057ef5dcaa72dc0d2ab5d1553b06757449fa1
diff --cc src/main.c
Simple merge
Simple merge