Merge updates from trunk.

FossilOrigin-Name: fa2a91e6c631864846484d13cffdc51856953cd1

diff --cc manifest
index aebeed794a69b94901f1ac0b3cc31538767cb814,4b1070228cfd8ab331c0390965caddb0a94c5a43..45330aae4ae16ab077a7d0e0a80f66342438183a
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,9 -1,9 +1,9 @@@
 -C Disable\sposix_fallocate()\sfor\sall\ssystems,\sall\sthe\stime,\sunless\sthe\nHAVE_POSIX_FALLOCATE\scompile-time\smacro\sis\ssupplied.
 -D 2013-06-20T14:07:37.671
 +C Merge\supdates\sfrom\strunk.
- D 2013-05-15T08:00:44.446
++D 2013-06-21T18:32:11.955
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
- F Makefile.in ce81671efd6223d19d4c8c6b88ac2c4134427111
+ F Makefile.in 5e41da95d92656a5004b03d3576e8b226858a28e
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
- F Makefile.msc 8f4ee0dab220a5276d5da61149dfd6cd5d1dd5b8
+ F Makefile.msc 7d226394826f060f232c0a02a468e8651819b7c2
  F Makefile.vxworks db21ed42a01d5740e656b16f92cb5d8d5e5dd315
  F README cd04a36fbc7ea56932a4052d7d0b7f09f27c33d6
  F VERSION 05c7bd63b96f31cfdef5c766ed91307ac121f5aa
@@@ -146,10 -171,10 +171,10 @@@ F src/complete.c dc1d136c0feee03c2f7550
  F src/ctime.c 4262c227bc91cecc61ae37ed3a40f08069cfa267
  F src/date.c 067a81c9942c497aafd2c260e13add8a7d0c7dd4
  F src/delete.c aeabdabeeeaa0584127f291baa9617153d334778
- F src/expr.c 437c03d5bb4fe3a53ecab3ad0286d6c5260da7ed
+ F src/expr.c ac9d259eea3123faa05fabe6dd8717696aca72b1
  F src/fault.c 160a0c015b6c2629d3899ed2daf63d75754a32bb
  F src/fkey.c e16942bd5c8a868ac53287886464a5ed0e72b179
- F src/func.c d15b1ffee8b9130967a0fbe90a16e1c8788d7442
 -F src/func.c 5c50c1ea31fd864b0fe921fe1a8d4c55acd609ef
++F src/func.c 771ceaa9b3e8e3a4ee55839b03e5f99ddf300c1d
  F src/global.c 5caf4deab621abb45b4c607aad1bd21c20aac759
  F src/hash.c ac3470bbf1ca4ae4e306a8ecb0fdf1731810ffe4
  F src/hash.h 8890a25af81fb85a9ad7790d32eedab4b994da22
@@@ -176,26 -201,26 +201,26 @@@ F src/notify.c 976dd0f6171d4588e89e874f
  F src/os.c b4ad71336fd96f97776f75587cd9e8218288f5be
  F src/os.h 4a46270a64e9193af4a0aaa3bc2c66dc07c29b3f
  F src/os_common.h 92815ed65f805560b66166e3583470ff94478f04
- F src/os_unix.c 5e0b0ca7594f6707a3ed155528a3ba3318c95e15
- F src/os_win.c 4e2bf0760409aef35e298ff725054e94d834e1a3
- F src/pager.c 49e23f9898113ddfe90942bdf1c1ef57955d0921
+ F src/os_unix.c 9eafa5458cf2ff684ddccff82c9bb113c7cad847
+ F src/os_win.c 5f018dbd4cec25c5b47e11432b946a7d2ccee60b
+ F src/pager.c 79df56da9dd49aceaa4cac207484a9a82cba40ae
  F src/pager.h 5cb78b8e1adfd5451e600be7719f5a99d87ac3b1
- F src/parse.y 9708365594eea519cdc8504dee425c0a41c79502
+ F src/parse.y 9acfcc83ddbf0cf82f0ed9582ccf0ad6c366ff37
  F src/pcache.c f8043b433a57aba85384a531e3937a804432a346
  F src/pcache.h a5e4f5d9f5d592051d91212c5949517971ae6222
- F src/pcache1.c 9fd22671c270b35131ef480bbc00392b8b5f8ab9
- F src/pragma.c 8779308bc1ea1901c4bc94dfe9a83d436f73f52c
+ F src/pcache1.c d23d07716de96c7c0c2503ec5051a4384c3fb938
+ F src/pragma.c 67a611bd4be0754f27ee13eb87932c3b14415862
  F src/prepare.c 743e484233c51109666d402f470523553b41797c
- F src/printf.c 4a9f882f1c1787a8b494a2987765acf9d97ac21f
+ F src/printf.c bff529ed47657098c55c9910b9c69b1b3b1a1353
  F src/random.c cd4a67b3953b88019f8cd4ccd81394a8ddfaba50
- F src/resolve.c 83cc2d942ee216bc56956c6e6fadb691c1727fa1
+ F src/resolve.c 89f9003e8316ee3a172795459efc2a0274e1d5a8
  F src/rowset.c 64655f1a627c9c212d9ab497899e7424a34222e0
- F src/select.c a4641882279becc200f2680f55f3e89d4e7c7f78
- F src/shell.c 2109d54f67c815a100abd7dc6a6e25eddb3b97eb
- F src/sqlite.h.in 5a5a22a9b192d81a9e5dee00274e3a0484c4afb1
+ F src/select.c 22ee971346a736ddefdc4497d07c92f2e9978afc
+ F src/shell.c ab6eea968c8745be3aa74e45fedb37d057b4cd0d
+ F src/sqlite.h.in 5b390ca5d94e09e56e7fee6a51ddde4721b89f8e
  F src/sqlite3.rc fea433eb0a59f4c9393c8e6d76a6e2596b1fe0c0
  F src/sqlite3ext.h d936f797812c28b81b26ed18345baf8db28a21a5
- F src/sqliteInt.h 8ed1fae12161f4e6978f3e53668b6353ed97b6be
 -F src/sqliteInt.h 46fb17f604ce941551fe64c342dbeb4dbed3edaa
++F src/sqliteInt.h c3279fe5faf68ba7faaf0263514dca3017399b03
  F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d
  F src/status.c bedc37ec1a6bb9399944024d63f4c769971955a9
  F src/table.c 2cd62736f845d82200acfa1287e33feb3c15d62e
@@@ -1063,7 -1093,7 +1094,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 d63fa039a01330f5300c3a936d2f9ffb018952b9 cf5c3642247fdd34d87f0368594cd7b8f081636a
- R cff218c2280bd3c50fb89dc3b6298e35
 -P 2b2ade92788be623af6f57e37d98994be2cec142
 -R 4c8df645fee7190a620dee659859568b
 -U drh
 -Z 4cfe85260540c90b4ee0898bd7491d71
++P 6fbad957259eb8c15eaf7e5657240ae24aaf343e b674462243138fcee192ef05d434665e30c681c4
++R 612ff5a12d31b338ed757ecbce2de7e8
 +U mistachkin
- Z 94c438a207a67cb0245aa3951aad0302
++Z d50d5563e695cb5fa48c05a0f64143b0

diff --cc manifest.uuid
index ab9045f7584dc6c02349566dbde5cbee7eeb0752,225d72de721e817656e494f7c3a49d6e729d77f2..5520fa844494afea2513f54be4649ab0215f83f5
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 6fbad957259eb8c15eaf7e5657240ae24aaf343e
 -b674462243138fcee192ef05d434665e30c681c4
++fa2a91e6c631864846484d13cffdc51856953cd1

diff --cc src/func.c
Simple merge

diff --cc src/sqliteInt.h
Simple merge