Merge updates from trunk.

FossilOrigin-Name: ffc6e682836cdf275189427109f8af2aeb423bcd

diff --cc manifest
index 4dcfa0f08d8ae1ac69f1f8173886bfbb4bca63fd,511e1108fef2ac6519f3d4d612db25fc6fb07ac6..e4961822f3508b83261ab88402e2db0dc15d6756
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Add\stest\scases\sfor\stointeger()\sand\storeal()\sfunctions.\s\sFixes\sfor\sseveral\stests.
- D 2013-08-20T09:26:38.953
 -C Add\sthe\swin32-longpath\sVFS\sallowing\swindows\sfilenames\sup\sto\s32K\scharacters\sin\nlength.\s\sRemove\sunused\scode\swhen\s-DSQLITE_MAX_MMAP_SIZE=0.\s\sFix\ssome\ncompiler\swarnings\son\swindows.
 -D 2013-08-28T18:18:12.076
++C Merge\supdates\sfrom\strunk.
++D 2013-08-28T18:56:04.093
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in 5e41da95d92656a5004b03d3576e8b226858a28e
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@@ -155,27 -155,27 +155,27 @@@ F mptest/multiwrite01.test 499ad0310da8
  F spec.template 86a4a43b99ebb3e75e6b9a735d5fd293a24e90ca
  F sqlite.pc.in 42b7bf0d02e08b9e77734a47798d1a55a9e0716b
  F sqlite3.1 6be1ad09113570e1fc8dcaff84c9b0b337db5ffc
- F sqlite3.pc.in ae6f59a76e862f5c561eb32a380228a02afc3cad
- F src/alter.c f8db986c03eb0bfb221523fc9bbb9d0b70de3168
- F src/analyze.c a33fcb0b3a399d966951feb9f32115106b3ecc2e
- F src/attach.c 5df737912f668fd160ec1d560755f85fdccbe5b7
+ F sqlite3.pc.in 48fed132e7cb71ab676105d2a4dc77127d8c1f3a
+ F src/alter.c 2af0330bb1b601af7a7789bf7229675fd772a083
+ F src/analyze.c 7f869a251f3d58d3b95883eeae425d4ee17a66bd
+ F src/attach.c fea00cab11c854646a27641a263f5876569a51f9
  F src/auth.c 523da7fb4979469955d822ff9298352d6b31de34
- F src/backup.c 43b348822db3e4cef48b2ae5a445fbeb6c73a165
+ F src/backup.c 2f1987981139bd2f6d8c728d64bf09fb387443c3
  F src/bitvec.c 19a4ba637bd85f8f63fc8c9bae5ade9fb05ec1cb
  F src/btmutex.c 976f45a12e37293e32cae0281b15a21d48a8aaa7
- F src/btree.c adea13e65d6c7b969bcd74cea6ae79b2d3c393fa
+ F src/btree.c b9b57df546df2636294bfb21a986f5707b417df2
  F src/btree.h bfe0e8c5759b4ec77b0d18390064a6ef3cdffaaf
  F src/btreeInt.h 51cf220a9b9223354770883e93a859dc377aa27f
- F src/build.c f99a715ff9290996b579d5e1ec8e94239dc9ae5e
+ F src/build.c f63e8929c7f89c0074fbc74929bc946ea117b2f8
  F src/callback.c d7e46f40c3cf53c43550b7da7a1d0479910b62cc
  F src/complete.c dc1d136c0feee03c2f7550bafc0d29075e36deac
- F src/ctime.c 4262c227bc91cecc61ae37ed3a40f08069cfa267
+ F src/ctime.c ea4b7f3623a0fcb1146e7f245d7410033e86859c
  F src/date.c 067a81c9942c497aafd2c260e13add8a7d0c7dd4
  F src/delete.c 2317c814866d9aa71fea16b3faf4fdd4d6a49b94
- F src/expr.c 42d8235af422661ab80be097bebca485b33e2e14
+ F src/expr.c 4d89bd03a04fcdb5ff71d86b4e0cc7d3230797b8
  F src/fault.c 160a0c015b6c2629d3899ed2daf63d75754a32bb
  F src/fkey.c 914a6bbd987d857c41ac9d244efa6641f36faadb
- F src/func.c c47ebaaf71b862edee4beaa041fd77e369d27d6d
 -F src/func.c 5b064acd303b3e74f019ab551d423ff6cace4023
++F src/func.c f3ab79a3f46f5c744a14a649d8f4acec30a07cd4
  F src/global.c 5caf4deab621abb45b4c607aad1bd21c20aac759
  F src/hash.c ac3470bbf1ca4ae4e306a8ecb0fdf1731810ffe4
  F src/hash.h 8890a25af81fb85a9ad7790d32eedab4b994da22
@@@ -1106,7 -1108,7 +1109,7 @@@ F tool/warnings-clang.sh f6aa929dc20ef1
  F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
  F tool/wherecosttest.c f407dc4c79786982a475261866a161cd007947ae
  F tool/win/sqlite.vsix 97894c2790eda7b5bce3cc79cb2a8ec2fde9b3ac
- P 4438b9865826446721b7aa09295fe335bf2fafb7
- R 87152ed0f9f1782b5b4a8475fb92076d
 -P caab361ebee5f5c3fdafd9b1abe3d1ab7c5b4db9 ecd52ccf650ce2a4ab93c7c482289c1bc4768eeb
 -R 11a68a0ec35d591bf742b2cdf1cfbf81
 -U drh
 -Z 9c29f776d777867b35099fa354ac7430
++P 5e1e9fd5e4f189836442baa42244be00de13ff0f 12d0a8859de0a9d823997cfeccc77bd572cb6d13
++R 81e42b2f9c462fbb356fb6a9b3d50e1d
 +U mistachkin
- Z 1ef8a0ac47017357f676bd9db534f67b
++Z a257c970f64b4c0a5f36c110c9d698d7

diff --cc manifest.uuid
index 054e2b1e73a65ba5906d695eb03718ea4ab48dd7,5220527afbdea8b9bd96c978a458b272466f7bc8..013ba6347709eccea49485a2eba17b8330eb859a
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 5e1e9fd5e4f189836442baa42244be00de13ff0f
 -12d0a8859de0a9d823997cfeccc77bd572cb6d13
++ffc6e682836cdf275189427109f8af2aeb423bcd

diff --cc src/func.c
Simple merge