Merge updates from trunk.

FossilOrigin-Name: 6fbad957259eb8c15eaf7e5657240ae24aaf343e

diff --cc manifest
index 06ddd57ca45c771be4f005b6ec8ec78170c7eaed,525586f02f2fb9de6ee5a634d2e06f7587c123a9..aebeed794a69b94901f1ac0b3cc31538767cb814
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,12 -1,12 +1,12 @@@
 -C Add\sassert()s\sto\sthe\simplementation\sof\sxRead()\sin\sthe\sbuilt-in\sVFSes\sto\s\nverify\sthat\sthe\soffset\sparameter\sis\salways\snon-negative.
 -D 2013-05-09T18:12:40.898
 +C Merge\supdates\sfrom\strunk.
- D 2013-03-13T20:52:11.584
++D 2013-05-15T08:00:44.446
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
- F Makefile.in 9a804abbd3cae82d196e4d33aba13239e32522a5
+ F Makefile.in ce81671efd6223d19d4c8c6b88ac2c4134427111
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
- F Makefile.msc 1bed3bca025ee90441bb0c9f95f36f42b70bd839
- F Makefile.vxworks b18ad88e9a8c6a001f5cf4a389116a4f1a7ab45f
+ F Makefile.msc 8f4ee0dab220a5276d5da61149dfd6cd5d1dd5b8
+ F Makefile.vxworks db21ed42a01d5740e656b16f92cb5d8d5e5dd315
  F README cd04a36fbc7ea56932a4052d7d0b7f09f27c33d6
- F VERSION 6d4f66eaebabc42ef8c2a4d2d0caf4ce7ee81137
+ F VERSION 05c7bd63b96f31cfdef5c766ed91307ac121f5aa
  F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
  F addopcodes.awk 17dc593f791f874d2c23a0f9360850ded0286531
  F art/sqlite370.eps aa97a671332b432a54e1d74ff5e8775be34200c2
@@@ -79,13 -80,21 +80,21 @@@ F ext/fts3/tool/fts3view.c 6cfc5b67a5f0
  F ext/fts3/unicode/CaseFolding.txt 8c678ca52ecc95e16bc7afc2dbf6fc9ffa05db8c
  F ext/fts3/unicode/UnicodeData.txt cd07314edb62d49fde34debdaf92fa2aa69011e7
  F ext/fts3/unicode/mkunicode.tcl 7a9bc018e2962abb79563c5a39fe581fcbf2f675
- F ext/icu/README.txt bf8461d8cdc6b8f514c080e4e10dc3b2bbdfefa9
+ F ext/icu/README.txt d9fbbad0c2f647c3fdf715fc9fd64af53aedfc43
  F ext/icu/icu.c eb9ae1d79046bd7871aa97ee6da51eb770134b5a
  F ext/icu/sqliteicu.h 728867a802baa5a96de7495e9689a8e01715ef37
 -F ext/misc/fuzzer.c fb64a15af978ae73fa9075b9b1dfbe82b8defc6f
+ F ext/misc/amatch.c 3369b2b544066e620d986f0085d039c77d1ef17f
+ F ext/misc/closure.c fec0c8537c69843e0b7631d500a14c0527962cd6
 -F ext/misc/regexp.c c25c65fe775f5d9801fb8573e36ebe73f2c0c2e0
 -F ext/misc/spellfix.c f9d24a2b2617cee143b7841b453e4e1fd8f189cc
 -F ext/misc/wholenumber.c 784b12543d60702ebdd47da936e278aa03076212
++F ext/misc/fuzzer.c fb64a15af978ae73fa9075b9b1dfbe82b8defc6f w src/test_fuzzer.c
+ F ext/misc/ieee754.c 2565ce373d842977efe0922dc50b8a41b3289556
+ F ext/misc/nextchar.c 1131e2b36116ffc6fe6b2e3464bfdace27978b1e
++F ext/misc/regexp.c c25c65fe775f5d9801fb8573e36ebe73f2c0c2e0 w src/test_regexp.c
++F ext/misc/spellfix.c f9d24a2b2617cee143b7841b453e4e1fd8f189cc w src/test_spellfix.c
++F ext/misc/wholenumber.c 784b12543d60702ebdd47da936e278aa03076212 w src/test_wholenumber.c
  F ext/rtree/README 6315c0d73ebf0ec40dedb5aa0e942bc8b54e3761
- F ext/rtree/rtree.c ebd07d0f06dc167f1424ff3940a5711a3a039982
+ F ext/rtree/rtree.c 757abea591d4ff67c0ff4e8f9776aeda86b18c14
  F ext/rtree/rtree.h 834dbcb82dc85b2481cde6a07cdadfddc99e9b9e
- F ext/rtree/rtree1.test e474a2b5eff231496dbd073fe67e5fbaf7f444c9
+ F ext/rtree/rtree1.test cf679265ecafff494a768ac9c2f43a70915a6290
  F ext/rtree/rtree2.test acbb3a4ce0f4fbc2c304d2b4b784cfa161856bba
  F ext/rtree/rtree3.test a494da55c30ee0bc9b01a91c80c81b387b22d2dc
  F ext/rtree/rtree4.test c8fe384f60ebd49540a5fecc990041bf452eb6e0
@@@ -116,27 -132,27 +132,27 @@@ F sqlite3.1 6be1ad09113570e1fc8dcaff84c
  F sqlite3.pc.in ae6f59a76e862f5c561eb32a380228a02afc3cad
  F src/alter.c f8db986c03eb0bfb221523fc9bbb9d0b70de3168
  F src/analyze.c d5f895810e8ff9737c9ec7b76abc3dcff5860335
- F src/attach.c ea5247f240e2c08afd608e9beb380814b86655e1
+ F src/attach.c 1816f5a9eea8d2010fc2b22b44f0f63eb3a62704
  F src/auth.c 523da7fb4979469955d822ff9298352d6b31de34
- F src/backup.c b2cac9f7993f3f9588827b824b1501d0c820fa68
- F src/bitvec.c 26675fe8e431dc555e6f2d0e11e651d172234aa1
+ F src/backup.c b266767351ae2d847716c56fcb2a1fea7c761c03
+ F src/bitvec.c 19a4ba637bd85f8f63fc8c9bae5ade9fb05ec1cb
  F src/btmutex.c 976f45a12e37293e32cae0281b15a21d48a8aaa7
- F src/btree.c 746c4dafae8565b3be6fb9ce3bb1fa9f1e67cc59
- F src/btree.h 3ad7964d6c5b1c7bff569aab6adfa075f8bf06cd
+ F src/btree.c 480a6d255cc4f066029daf23dd54acf152cd0e13
+ F src/btree.h 6fa8a3ff2483d0bb64a9f0105a8cedeac9e00cca
  F src/btreeInt.h eecc84f02375b2bb7a44abbcbbe3747dde73edb2
- F src/build.c 375e5df716e03b9343c5e1211be3b24e6d6dff05
+ F src/build.c 083da8466fd7e481cb8bd5264398f537507f6176
  F src/callback.c d7e46f40c3cf53c43550b7da7a1d0479910b62cc
  F src/complete.c dc1d136c0feee03c2f7550bafc0d29075e36deac
- F src/ctime.c 72a70dcfda75d3a1f81041ce4573e7afddcd8e4e
+ F src/ctime.c 4262c227bc91cecc61ae37ed3a40f08069cfa267
  F src/date.c 067a81c9942c497aafd2c260e13add8a7d0c7dd4
  F src/delete.c aeabdabeeeaa0584127f291baa9617153d334778
- F src/expr.c d488bb60e54c9305d9fca1fa6fcc7bfbd23b13a2
+ F src/expr.c 437c03d5bb4fe3a53ecab3ad0286d6c5260da7ed
  F src/fault.c 160a0c015b6c2629d3899ed2daf63d75754a32bb
  F src/fkey.c e16942bd5c8a868ac53287886464a5ed0e72b179
- F src/func.c d83c67a1d247389af7ad8a4c05b3665027658a17
- F src/global.c e59ecd2c553ad0d4bfbc84ca71231336f8993a7a
 -F src/func.c d3fdcff9274bc161152e67ed3f626841c247f4b9
++F src/func.c d15b1ffee8b9130967a0fbe90a16e1c8788d7442
+ F src/global.c 5caf4deab621abb45b4c607aad1bd21c20aac759
  F src/hash.c ac3470bbf1ca4ae4e306a8ecb0fdf1731810ffe4
- F src/hash.h 2894c932d84d9f892d4b4023a75e501f83050970
+ F src/hash.h 8890a25af81fb85a9ad7790d32eedab4b994da22
  F src/hwtime.h d32741c8f4df852c7d959236615444e2b1063b08
  F src/insert.c f7cb141e8ce257cb6b15c497f09e4e23d6055599
  F src/journal.c b4124532212b6952f42eb2c12fa3c25701d8ba8d
@@@ -157,29 -173,29 +173,29 @@@ F src/mutex_noop.c 7682796b7d8d39bf1c13
  F src/mutex_unix.c c3a4e00f96ba068a8dbef34084465979aaf369cc
  F src/mutex_w32.c 32a9b3841e2d757355f0012b860b1bc5e01eafa0
  F src/notify.c 976dd0f6171d4588e89e874fcc765e92914b6d30
- F src/os.c e1acdc09ff3ac2412945cca9766e2dcf4675f31c
- F src/os.h 027491c77d2404c0a678bb3fb06286f331eb9b57
+ F src/os.c b4ad71336fd96f97776f75587cd9e8218288f5be
+ F src/os.h 4a46270a64e9193af4a0aaa3bc2c66dc07c29b3f
  F src/os_common.h 92815ed65f805560b66166e3583470ff94478f04
- F src/os_unix.c f6387eef0cf8f6b808738f4f3aa47e6132af0940
- F src/os_win.c f7da4dc0a2545c0a430080380809946ae4d676d6
- F src/pager.c 582f8da52d0bd4b43d3bdaeba0ea7702c1f23702
- F src/pager.h 1109a06578ec5574dc2c74cf8d9f69daf36fe3e0
- F src/parse.y 5d5e12772845805fdfeb889163516b84fbb9ae95
+ F src/os_unix.c 5e0b0ca7594f6707a3ed155528a3ba3318c95e15
+ F src/os_win.c 4e2bf0760409aef35e298ff725054e94d834e1a3
+ F src/pager.c 49e23f9898113ddfe90942bdf1c1ef57955d0921
+ F src/pager.h 5cb78b8e1adfd5451e600be7719f5a99d87ac3b1
+ F src/parse.y 9708365594eea519cdc8504dee425c0a41c79502
  F src/pcache.c f8043b433a57aba85384a531e3937a804432a346
- F src/pcache.h 1b5dcc3dc8103d03e625b177023ee67764fa6b7c
+ F src/pcache.h a5e4f5d9f5d592051d91212c5949517971ae6222
  F src/pcache1.c 9fd22671c270b35131ef480bbc00392b8b5f8ab9
- F src/pragma.c 9f0ee3d74a7f33eeeff40a4b014fc3abf8182ce2
- F src/prepare.c 78cd7ae8cd0d8de8ef8a8b5352fc5f38693a0852
+ F src/pragma.c 8779308bc1ea1901c4bc94dfe9a83d436f73f52c
+ F src/prepare.c 743e484233c51109666d402f470523553b41797c
  F src/printf.c 4a9f882f1c1787a8b494a2987765acf9d97ac21f
  F src/random.c cd4a67b3953b88019f8cd4ccd81394a8ddfaba50
- F src/resolve.c 9079da7d59aed2bb14ec8315bc7f720dd85b5b65
+ F src/resolve.c 83cc2d942ee216bc56956c6e6fadb691c1727fa1
  F src/rowset.c 64655f1a627c9c212d9ab497899e7424a34222e0
- F src/select.c e1c6f6abdf9f359f4e735cb8ae11d2f359bf52a9
- F src/shell.c 7c41bfcd9e5bf9d96b9215f79b03a5b2b44a3bca
- F src/sqlite.h.in f2fa32f440dda59ca47e22889966b2a6eb3b491c
+ F src/select.c a4641882279becc200f2680f55f3e89d4e7c7f78
+ F src/shell.c 2109d54f67c815a100abd7dc6a6e25eddb3b97eb
+ F src/sqlite.h.in 5a5a22a9b192d81a9e5dee00274e3a0484c4afb1
  F src/sqlite3.rc fea433eb0a59f4c9393c8e6d76a6e2596b1fe0c0
- F src/sqlite3ext.h 7183ab832e23db0f934494f16928da127a571d75
- F src/sqliteInt.h d86179b5d56992f1e9b51b602d586e84bc801a2b
+ F src/sqlite3ext.h d936f797812c28b81b26ed18345baf8db28a21a5
 -F src/sqliteInt.h 4cc782c9a89b3ddd663e7f68af3fa9e5af596f8b
++F src/sqliteInt.h 8ed1fae12161f4e6978f3e53668b6353ed97b6be
  F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d
  F src/status.c bedc37ec1a6bb9399944024d63f4c769971955a9
  F src/table.c 2cd62736f845d82200acfa1287e33feb3c15d62e
@@@ -508,10 -525,9 +525,10 @@@ F test/fts4merge2.test 5faa558d1b672f82
  F test/fts4merge3.test aab02a09f50fe6baaddc2e159c3eabc116d45fc7
  F test/fts4unicode.test 25ccad45896f8e50f6a694cff738a35f798cdb40
  F test/full.test 6b3c8fb43c6beab6b95438c1675374b95fab245d
- F test/func.test b058483c17952eff7797b837bbb61e27e6b05606
+ F test/func.test b0fc34fdc36897769651975a2b0a606312753643
  F test/func2.test 772d66227e4e6684b86053302e2d74a2500e1e0f
  F test/func3.test 001021e5b88bd02a3b365a5c5fd8f6f49d39744a
 +F test/func4.test cf09a622b456d3e2f33a3fb1a2be8eec7a8e35e2
  F test/fuzz-oss1.test 4912e528ec9cf2f42134456933659d371c9e0d74
  F test/fuzz.test 77fd50afc12847af50fcf1941679d90adebadde6
  F test/fuzz2.test 207d0f9d06db3eaf47a6b7bfc835b8e2fc397167
@@@ -1039,7 -1062,7 +1063,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 12c318ef1b674d1ef347458ce149398885f5ba10 0b452734faa0839c817f040322e7733e423bfce2
- R 011bab8d3358f6e92d6e93fde439def7
 -P 1128575d0ab24f7023a0f6e6ce4828b9a09a7c6c
 -R 1cad29e868ca8cf8d5b7d354acd90934
 -U drh
 -Z 3b3f34da85296e9879a826be138cb510
++P d63fa039a01330f5300c3a936d2f9ffb018952b9 cf5c3642247fdd34d87f0368594cd7b8f081636a
++R cff218c2280bd3c50fb89dc3b6298e35
 +U mistachkin
- Z c88ff015026f12ea9197209e8f5b599c
++Z 94c438a207a67cb0245aa3951aad0302

diff --cc manifest.uuid
index ab8ba3ce59adf538c897d444e81236e8d3ab57bd,03a8fec162bfe28946a339957f24df516cc23161..ab9045f7584dc6c02349566dbde5cbee7eeb0752
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- d63fa039a01330f5300c3a936d2f9ffb018952b9
 -cf5c3642247fdd34d87f0368594cd7b8f081636a
++6fbad957259eb8c15eaf7e5657240ae24aaf343e

diff --cc src/func.c
Simple merge

diff --cc src/sqliteInt.h
Simple merge