From: drh <drh@noemail.net>
Date: Tue, 6 Aug 2013 14:52:27 +0000 (+0000)
Subject: Merge in the latest changes from trunk.
X-Git-Tag: version-3.13.0~148^2~186
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=700a7fdf833ce71ee46da1292f96e82afa2dd2f2;p=thirdparty%2Fsqlite.git

Merge in the latest changes from trunk.

FossilOrigin-Name: 69d5bed017bda3e184857febcc8b6f6bed6ad228
---

700a7fdf833ce71ee46da1292f96e82afa2dd2f2
diff --cc manifest
index e618763032,23e2bb7256..f65f205e5e
--- a/manifest
+++ b/manifest
@@@ -1,9 -1,9 +1,9 @@@
- C Merge\sin\sthe\slatest\strunk\schanges,\sincluding\spartial\sindexes,\sthe\sMAX_PATH\nfix\sin\sos_win.c,\sand\sthe\ssqlite3_cancel_auto_extension()\sAPI.
- D 2013-08-02T20:44:48.965
 -C For\sthe\s".import"\scommand\sof\sthe\scommand-line\sshell,\sstart\sa\stransaction\nif\sthere\sis\snot\sone\sactive\salready.
 -D 2013-08-06T14:36:36.363
++C Merge\sin\sthe\slatest\schanges\sfrom\strunk.
++D 2013-08-06T14:52:27.425
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 -F Makefile.in 5e41da95d92656a5004b03d3576e8b226858a28e
 +F Makefile.in aff38bc64c582dd147f18739532198372587b0f0
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
 -F Makefile.msc e9f41f89111627baaabd95cab4988b8d1c3e47c9
 +F Makefile.msc e5cc521bbc9fb09f032f7fef563542da7ac5544a
  F Makefile.vxworks db21ed42a01d5740e656b16f92cb5d8d5e5dd315
  F README cd04a36fbc7ea56932a4052d7d0b7f09f27c33d6
  F VERSION f135b651727f978b7191bd6fa12c7fc1e13e13ac
@@@ -184,8 -171,8 +184,8 @@@ F src/callback.c d7e46f40c3cf53c43550b7
  F src/complete.c dc1d136c0feee03c2f7550bafc0d29075e36deac
  F src/ctime.c 4262c227bc91cecc61ae37ed3a40f08069cfa267
  F src/date.c 067a81c9942c497aafd2c260e13add8a7d0c7dd4
 -F src/delete.c 2317c814866d9aa71fea16b3faf4fdd4d6a49b94
 +F src/delete.c 30ed4bc76a1a32c55bf17ac1528c5867aa5502c0
- F src/expr.c 2068a7c17e45f8bee6e44205b059aa30acbc71c5
+ F src/expr.c 7e55edefb8bd0b35b382ce9226c58472cd63a443
  F src/fault.c 160a0c015b6c2629d3899ed2daf63d75754a32bb
  F src/fkey.c 914a6bbd987d857c41ac9d244efa6641f36faadb
  F src/func.c 5c50c1ea31fd864b0fe921fe1a8d4c55acd609ef
@@@ -229,12 -216,12 +229,12 @@@ F src/printf.c 41c49dac366a3a411190001a
  F src/random.c cd4a67b3953b88019f8cd4ccd81394a8ddfaba50
  F src/resolve.c 17e670996729ac41aadf6a31f57b4e6f29b3d819
  F src/rowset.c 64655f1a627c9c212d9ab497899e7424a34222e0
- F src/select.c 20369c82dc38eb4a77b458c8f6e353ef550580c9
- F src/shell.c 52f975eae87c8338c4dfbf4c2842d2a0971f01fd
+ F src/select.c 8b148eb851f384412aea57091659d14b369918ca
+ F src/shell.c 927e17b37b63b24461e372d982138fb22c4df321
 -F src/sqlite.h.in 442c109e0c3447c34b1794971ecdb673ce08a843
 +F src/sqlite.h.in 9dbc04c103f297d2bd26c7e323f0bdb9aaf0dc8a
  F src/sqlite3.rc fea433eb0a59f4c9393c8e6d76a6e2596b1fe0c0
  F src/sqlite3ext.h 886f5a34de171002ad46fae8c36a7d8051c190fc
- F src/sqliteInt.h 717511de3ce0129f9e02f98427b6a5991bbe64e4
 -F src/sqliteInt.h def0e436c0d4ca5084305ca6ae898020fbafaae4
++F src/sqliteInt.h 1f9abddff71bbce4f51d275d3dc5262ceae7aa61
  F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d
  F src/status.c 7ac05a5c7017d0b9f0b4bcd701228b784f987158
  F src/table.c 2cd62736f845d82200acfa1287e33feb3c15d62e
@@@ -284,18 -271,18 +284,18 @@@ F src/test_thread.c 1e133a40b50e9c035b0
  F src/test_vfs.c e72f555ef7a59080f898fcf1a233deb9eb704ea9
  F src/test_vfstrace.c 34b544e80ba7fb77be15395a609c669df2e660a2
  F src/test_wsd.c 41cadfd9d97fe8e3e4e44f61a4a8ccd6f7ca8fe9
- F src/tokenize.c e0e8fd3cb90a88451f6b6425726c84747b6b20d7
+ F src/tokenize.c 70061085a51f2f4fc15ece94f32c03bcb78e63b2
  F src/trigger.c 5c0ea9b8755e7c5e1a700f3e27ac4f8d92dd221e
 -F src/update.c 7f3fe64d8f3b44c44a1eac293f0f85f87c355b7a
 +F src/update.c e3668141dd9701023681239265e001388f182236
  F src/utf.c 8d819e2e5104a430fc2005f018db14347c95a38f
  F src/util.c f566b5138099a2df8533b190d0dcc74b7dfbe0c9
  F src/vacuum.c d9c5759f4c5a438bb43c2086f72c5d2edabc36c8
- F src/vdbe.c 619306bc26158896392c84eb3c593e9bff35c49a
 -F src/vdbe.c 4914ae1d00045a5310aea9e0f7c9a8edd3d9f856
 -F src/vdbe.h 4f554b5627f26710c4c36d919110a3fc611ca5c4
 -F src/vdbeInt.h e9b7c6b165a31a4715c5aa97223d20d265515231
 -F src/vdbeapi.c 4d13580bd058b39623e8fcfc233b7df4b8191e8b
 -F src/vdbeaux.c a6ea36a9dc714e1128a0173249a0532ddcab0489
 -F src/vdbeblob.c 5dc79627775bd9a9b494dd956e26297946417d69
++F src/vdbe.c 1d95ab3d4aae198744c1c14170b2466b58eb8970
 +F src/vdbe.h 7aa3ab6210a68471c8490dedfc9aa4ef5684b9a0
 +F src/vdbeInt.h cc1974b94efa98ecaec6fa14a2584d7c1e82eadf
 +F src/vdbeapi.c c8c433043d14b5e00e2ed6f7e44543bcc92d1594
- F src/vdbeaux.c ef37cae69147a3680f6b1927b99f79a89c8ff53c
++F src/vdbeaux.c 6549864e5fffa3d04941551610e4800de72e1be9
 +F src/vdbeblob.c 1268e0bcb8e21fa32520b0fc376e1bcdfaa0c642
  F src/vdbemem.c 833005f1cbbf447289f1973dba2a0c2228c7b8ab
  F src/vdbesort.c 3937e06b2a0e354500e17dc206ef4c35770a5017
  F src/vdbetrace.c e7ec40e1999ff3c6414424365d5941178966dcbc
@@@ -1119,7 -1105,7 +1119,7 @@@ F tool/warnings-clang.sh f6aa929dc20ef1
  F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
  F tool/wherecosttest.c f407dc4c79786982a475261866a161cd007947ae
  F tool/win/sqlite.vsix 97894c2790eda7b5bce3cc79cb2a8ec2fde9b3ac
- P 8dfc0b78c38e519b64a796243ff7c0aff688ff36 c5c0a8ab6c222185d5f9d4321e64d9f93cd36b7d
- R 6bd6d033a187336743a83e4c58485278
 -P 2b1743d60171635c1e5a6ede6b4928f4671f948d
 -R 52d68f7d6fd0cf4ecec25cf61e17c3e0
++P 7e1acb390770d1bd189fac7a3a7f96106f96e3a4 5dcc2d91bd343cd0fac79d3c8f079a5ce534cdf7
++R 16c019af84c40424fdcd3228006de852
  U drh
- Z 807175c2ca92264cb8fa0f2650b5caad
 -Z 274a34c6d0a826d2bb04d7b9aabecdb7
++Z 236e21ad4140ab8f1ddcd5409f261d54
diff --cc manifest.uuid
index e2f6ff0bea,a49cab56b3..4136a8e123
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 7e1acb390770d1bd189fac7a3a7f96106f96e3a4
 -5dcc2d91bd343cd0fac79d3c8f079a5ce534cdf7
++69d5bed017bda3e184857febcc8b6f6bed6ad228