Merge all the latest trunk changes into the apple-osx branch.

FossilOrigin-Name: 18ec60cacd37a70d598ac1af5e50faffa73bb134

diff --cc manifest
index 709656814f47de5cab21babfa35598d57c86ef35,5e66a79aee2dfc645bd07e7f196c4162300aff24..53f5c8bfbf98390248e6841a61930d600d0809c0
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,7 -1,7 +1,7 @@@
- C Merge\slatest\strunk\schanges\sinto\sapple-osx\sbranch.
- D 2012-03-19T16:21:28.474
 -C Do\smore\saggressive\soptimization\sof\sthe\sAND\soperator\swhere\sone\sside\sor\sthe\nother\sis\salways\sfalse.
 -D 2012-03-31T02:34:35.585
++C Merge\sall\sthe\slatest\strunk\schanges\sinto\sthe\sapple-osx\sbranch.
++D 2012-03-31T02:46:20.444
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 -F Makefile.in 2f37e468503dbe79d35c9f6dffcf3fae1ae9ec20
 +F Makefile.in 7bd2fa7753fc9de38994b8d4fa7f10deb19966a5
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
  F Makefile.msc 7849a871b6cdb20fd51baee6bbe5965a03326be4
  F Makefile.vxworks 3b7fe7a0571fdadc61363ebc1b23732d2d6363ca
@@@ -128,29 -126,29 +129,29 @@@ F src/auth.c 523da7fb4979469955d822ff92
  F src/backup.c 6be23a344d3301ae38e92fddb3a33b91c309fce4
  F src/bitvec.c af50f1c8c0ff54d6bdb7a80e2fceca5a93670bef
  F src/btmutex.c 976f45a12e37293e32cae0281b15a21d48a8aaa7
- F src/btree.c fbaf57644615a46ffd1117096d1ef9197e34de1f
 -F src/btree.c 02aeee1f6d425e11f7b9b2d9d461ac501645ed6f
++F src/btree.c 748ff64c56e6aee3d60200321e6b86c1b9a777b8
  F src/btree.h 48a013f8964f12d944d90e4700df47b72dd6d923
  F src/btreeInt.h 26d8ca625b141927fe6620c1d2cf58eaf494ca0c
- F src/build.c c4d36e527f457f9992a6663365871dfa7c5094b8
+ F src/build.c 987c6933ea170e443dc6a79d52f8d2506206b12b
  F src/callback.c 0425c6320730e6d3981acfb9202c1bed9016ad1a
  F src/complete.c dc1d136c0feee03c2f7550bafc0d29075e36deac
  F src/ctime.c a9c26822515f81ec21588cbb482ca6724be02e33
  F src/date.c 067a81c9942c497aafd2c260e13add8a7d0c7dd4
- F src/delete.c 51d32f0a9c880663e54ce309f52e40c325d5e112
- F src/expr.c 00675123e0beec98f999aa4594d2cbe1fec33c1b
+ F src/delete.c 4c20ea4f6213b3bc1c6a510586864b679946e05e
+ F src/expr.c ebb0e2b21379d4ec0c5c2c7c952784cb300c8436
  F src/fault.c 160a0c015b6c2629d3899ed2daf63d75754a32bb
  F src/fkey.c 657212460bf5cfd3ae607d12ea62092844c227b5
- F src/func.c bbbbc0d92d21f3e7cd77b37db5ecc64b9154410b
 -F src/func.c c6b3c94320253a35bda43fb69cc292618e3285d6
++F src/func.c 067e50003af2b3c3b2f65575837ae8ef4be676f9
  F src/global.c 4cfdca5cb0edd33c4d021baec4ede958cb2c793b
  F src/hash.c 458488dcc159c301b8e7686280ab209f1fb915af
  F src/hash.h 2894c932d84d9f892d4b4023a75e501f83050970
  F src/hwtime.h d32741c8f4df852c7d959236615444e2b1063b08
- F src/insert.c d7c69718acbb92e10e4b121da7bed13903342962
+ F src/insert.c 93eb9542ae1376d9317a7c8335d7e379f010aa76
  F src/journal.c 552839e54d1bf76fb8f7abe51868b66acacf6a0e
 -F src/legacy.c a199d7683d60cef73089e892409113e69c23a99f
 +F src/legacy.c 015826a958f690302d27e096a68d50b3657e4201
  F src/lempar.c 0ee69fca0be54cd93939df98d2aca4ca46f44416
  F src/loadext.c f20382fbaeec832438a1ba7797bee3d3c8a6d51d
 -F src/main.c 91458c713e9b7f8dbc98d79e78f1150f0ca9c2a1
 +F src/main.c d61d7eacf656b19b353e2cab34daf4eba4ba8c8f
  F src/malloc.c 15afac5e59b6584efe072e9933aefb4230e74f97
  F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
  F src/mem1.c b3677415e69603d6a0e7c5410a1b3731d55beda1
@@@ -169,11 -167,11 +170,11 @@@ F src/os.c 4c8c8d72a6c58ad2fde4865783e8
  F src/os.h 59beba555b65a450bd1d804220532971d4299f60
  F src/os_common.h 92815ed65f805560b66166e3583470ff94478f04
  F src/os_os2.c 4a75888ba3dfc820ad5e8177025972d74d7f2440
 -F src/os_unix.c 0e3d2942d228d0366fb80a3640f35caf413b66d1
 -F src/os_win.c 5e9e933a412ab35de2a6506b3c6a8295b31b309e
 -F src/pager.c 85988507fa20acc60defb834722eddf4633e4aeb
 +F src/os_unix.c c008584c899e9c6b702078fbb9cb59839a0a66d3
- F src/os_win.c 30dce5f00ca11ed0df4928ead901ea82f6c873c4
- F src/pager.c a5bacc1a1913443fc4327f649dd74ccdcf28c4b8
++F src/os_win.c 12e76b4aa5426022939f92e894a5c20dd40be7f4
++F src/pager.c ce4fde5951bf71b4f5316ff5afd0219ff7e99b3f
  F src/pager.h ef1eaf8593e78f73885c1dfac27ad83bee23bdc5
- F src/parse.y 1ddd71ae55f4b7cbb2672526ea4de023de0f519e
+ F src/parse.y eb054bb40a5bf90d3422a01ed0e5df229461727a
  F src/pcache.c f8043b433a57aba85384a531e3937a804432a346
  F src/pcache.h 1b5dcc3dc8103d03e625b177023ee67764fa6b7c
  F src/pcache1.c b30b1c35908346ecc43d8d9d17f2ddf6817f8f60
@@@ -183,24 -181,23 +184,24 @@@ F src/printf.c 7ffb4ebb8b341f67e049695b
  F src/random.c cd4a67b3953b88019f8cd4ccd81394a8ddfaba50
  F src/resolve.c 3d3e80a98f203ac6b9329e9621e29eda85ddfd40
  F src/rowset.c 69afa95a97c524ba6faf3805e717b5b7ae85a697
- F src/select.c 2d18d2e19f95d59c1a44f04866094f565bbc3b7d
- F src/shell.c aa28f117033ba3e44b5eaaf2ad572222bcdfd66e
- F src/sqlite.h.in a8cf754ae35c2c8e7ec4fe2195ed4ea40dc716f8
 -F src/select.c f6f141cb1ea13f1e6564d3e162700e4937baa2a1
++F src/select.c 36d5ed5c4504fd37c024141ce2b699148b231a8d
+ F src/shell.c abf18d6ee54f2631860a98fdd7ab1327f470db67
 -F src/sqlite.h.in 11a883919b0baf4ffaa7550cfeef99be613ec2bf
++F src/sqlite.h.in 5538b920986b8c1f8385b97b7ae31b74a39a9ca5
 +F src/sqlite3_private.h e3b586e0aa329075d99be7198df9bc80c5b19e2d
  F src/sqlite3ext.h 6904f4aadf976f95241311fbffb00823075d9477
- F src/sqliteInt.h e4a50c6ae8e2299191ee56739f5b8f0fafd9e653
 -F src/sqliteInt.h d701123ab4c8774ee2837cd4ade84e370d665f87
++F src/sqliteInt.h efee04f7c9e000b77d89f87baf77397b4025246c
  F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d
- F src/status.c 4568e72dfd36b6a5911f93457364deb072e0b03a
+ F src/status.c 35939e7e03abf1b7577ce311f48f682c40de3208
  F src/table.c 2cd62736f845d82200acfa1287e33feb3c15d62e
- F src/tclsqlite.c 2aeb69958965dad0842d5ea1456f1a958ef296e6
- F src/test1.c 0a90f9dbcfc884d8bf08c36776b8a2fe6d970ccd
+ F src/tclsqlite.c 086dfdd72e5892de223968a258e1ccbd9693e717
 -F src/test1.c 8631f728c9c3afcf79e3e22b510e451435e3d15e
++F src/test1.c fa09748bbcd6c3efa076e45648857e922ce97224
  F src/test2.c 711555927f1f7e8db9aab86b512bc6934a774abe
- F src/test3.c 91d3f1a09cfae3533ef17d8b484a160f3d1f1a21
+ F src/test3.c f82399ec50d9cd7378bf9d6db6c1409d5e77b042
  F src/test4.c d1e5a5e904d4b444cf572391fdcb017638e36ff7
  F src/test5.c a6d1ac55ac054d0b2b8f37b5e655b6c92645a013
- F src/test6.c 846ed1ed2f470de9b1e205fe3878a12e237b3e19
+ F src/test6.c 3329df2dbc0293031d763947ec08c9eef982ef1d
  F src/test7.c 2e0781754905c8adc3268d8f0967e7633af58843
- F src/test8.c 99f70341d6ec480313775127f4cd14b4a47db557
+ F src/test8.c 61b41d79509a479dec1ac32b6d4209b27c4b1ba5
  F src/test9.c bea1e8cf52aa93695487badedd6e1886c321ea60
  F src/test_async.c 0612a752896fad42d55c3999a5122af10dcf22ad
  F src/test_autoext.c 30e7bd98ab6d70a62bb9ba572e4c7df347fe645e
@@@ -215,22 -212,22 +216,22 @@@ F src/test_hexio.c c4773049603151704a6a
  F src/test_init.c 3cbad7ce525aec925f8fda2192d576d47f0d478a
  F src/test_intarray.c d879bbf8e4ce085ab966d1f3c896a7c8b4f5fc99
  F src/test_intarray.h 489edb9068bb926583445cb02589344961054207
- F src/test_journal.c a6a6baf343f79b942331f13378d045e7e270ae64
+ F src/test_journal.c b964473ff1b7a65626763f068fa6a810385d1fbf
  F src/test_loadext.c df586c27176e3c2cb2e099c78da67bf14379a56e
- F src/test_malloc.c cfe25d74333892ababde61196821a889b4756dee
- F src/test_multiplex.c 0404a61d7795438be5ee5fd3711eed80724df34d
+ F src/test_malloc.c 3f5903a1528fd32fe4c472a3bd0259128d8faaef
+ F src/test_multiplex.c 30ca0348953abd3add46fe4ee19e3f9e669b7e56
  F src/test_multiplex.h e99c571bc4968b7a9363b661481f3934bfead61d
  F src/test_mutex.c a6bd7b9cf6e19d989e31392b06ac8d189f0d573e
- F src/test_onefile.c 40cf9e212a377a6511469384a64b01e6e34b2eec
- F src/test_osinst.c 6abf0a37ce831120c4ef1b913afdd813e7ac1a73
+ F src/test_onefile.c 5e1382e7844c703c77c4c2aee82f8359555b5a8e
+ F src/test_osinst.c 7f790ac89c5a585d51b341274d9691c3391e0923
  F src/test_pcache.c a5cd24730cb43c5b18629043314548c9169abb00
- F src/test_quota.c b4a6519417d87870e7ef5838dbf3cae164dcc28d
+ F src/test_quota.c a545115f837da4ef32f6b5578f147b44cfb13fd7
  F src/test_quota.h 9ffa1d3ad6d0a6a24e8670ea64b909c717ec3358
 -F src/test_rtree.c 6d06306e29946dc36f528a3a2cdc3add794656f1
 +F src/test_rtree.c a2eebb68c0f1463918cdfbe603cb2e869c551038
  F src/test_schema.c 8c06ef9ddb240c7a0fcd31bc221a6a2aade58bf0
  F src/test_server.c 2f99eb2837dfa06a4aacf24af24c6affdf66a84f
- F src/test_stat.c 80271ad7d776a79babe0e025bb3a1bfcd3a3cfb1
+ F src/test_stat.c d7035cfcc0ff1f93c000b621f36524318e004e11
 -F src/test_superlock.c 2b97936ca127d13962c3605dbc9a4ef269c424cd
 +F src/test_superlock.c 12e2bc484c6c2ba837327d37f2e6a6fd9d1464f8
  F src/test_syscall.c a992d8c80ea91fbf21fb2dd570db40e77dd7e6ae
  F src/test_tclvar.c f4dc67d5f780707210d6bb0eb6016a431c04c7fa
  F src/test_thread.c e286f2173563f2a1747c24bcda6b9d030bf4f4e4
@@@ -242,22 -239,22 +243,22 @@@ F src/tokenize.c 1e86210d3976717a19238e
  F src/trigger.c ee7e178fb9188f44b532cebd449a7c1df90fb684
  F src/update.c d3076782c887c10e882996550345da9c4c9f9dea
  F src/utf.c 890c67dcfcc7a74623c95baac7535aadfe265e84
- F src/util.c 906731099c4397bf8adf3fa90a833355e7472af0
+ F src/util.c 4f6cfad661b2e3454b0cdd5b1b9d39a54942d0e3
  F src/vacuum.c bfd53f9bd20a8fdb70b0fa8e77182b866875c0d8
- F src/vdbe.c c4638fe3adb6d495e9c6513ecfaa055a1cd11d73
 -F src/vdbe.c 8913926230bfc9d183fcd44e3d023c6d393b6548
++F src/vdbe.c bcf472eecfe0bab9e7be7b615aa71c16cb27c6ea
  F src/vdbe.h 18f581cac1f4339ec3299f3e0cc6e11aec654cdb
  F src/vdbeInt.h 6ff4180a05683566a8835d12f7ec504b22932c82
 -F src/vdbeapi.c 3662b6a468a2a4605a15dfab313baa6dff81ad91
 -F src/vdbeaux.c 79cf42b70e211a52d664fc4d585ee2da0a64deac
 +F src/vdbeapi.c bf1f632719ee596d43ccf6c2ed68ff8911f5b376
 +F src/vdbeaux.c dfaa1694e43aea6470a53e50a318fe9f54d63374
  F src/vdbeblob.c 32f2a4899d67f69634ea4dd93e3f651936d732cb
  F src/vdbemem.c fb0ac964ccbcd94f595eb993c05bfd9c52468a4a
  F src/vdbesort.c b25814d385895544ebc8118245c8311ded7f81c9
 -F src/vdbetrace.c d6e50e04e1ec498150e519058f617d91b8f5c843
 +F src/vdbetrace.c 2405f68d14c49d2e0a798d71e35d62b8569bfb65
  F src/vtab.c ab90fb600a3f5e4b7c48d22a4cdb2d6b23239847
 -F src/wal.c 7bb3ad807afc7973406c805d5157ec7a2f65e146
 -F src/wal.h 29c197540b19044e6cd73487017e5e47a1d3dac6
 +F src/wal.c 8a89f4f60097c88e3b5c3baeb5f4942035411a29
 +F src/wal.h a8ade3069ab75e3c79e9ca067a5ac7e1dbaf93a6
  F src/walker.c 3112bb3afe1d85dc52317cb1d752055e9a781f8f
- F src/where.c 6baab5dfcf4472552c0346d04f6fd2f4f8539c78
+ F src/where.c 2112422a404dcca5d47f6630bdf180bccd36c62b
  F test/8_3_names.test 631ea964a3edb091cf73c3b540f6bcfdb36ce823
  F test/aggerror.test a867e273ef9e3d7919f03ef4f0e8c0d2767944f2
  F test/alias.test 4529fbc152f190268a15f9384a5651bbbabc9d87
@@@ -519,7 -521,8 +525,8 @@@ F test/in3.test 3cbf58c87f4052cee3a58b3
  F test/in4.test 64f3cc1acde1b9161ccdd8e5bde3daefdb5b2617
  F test/incrblob.test 26fde912a1e0aff158b3a84ef3b265f046aad3be
  F test/incrblob2.test edc3a96e557bd61fb39acc8d2edd43371fbbaa19
 -F test/incrblob3.test aedbb35ea1b6450c33b98f2b6ed98e5020be8dc7
 +F test/incrblob3.test 086482e7937202be9f8cf327117a042d8628fe7d
+ F test/incrblob4.test 09be37d3dd996a31ea6993bba7837ece549414a8
  F test/incrblob_err.test d2562d2771ebffd4b3af89ef64c140dd44371597
  F test/incrblobfault.test 917c0292224c64a56ef7215fd633a3a82f805be0
  F test/incrvacuum.test d2a6ddf5e429720b5fe502766af747915ccf6c32
@@@ -630,18 -632,18 +637,18 @@@ F test/notnull.test cc7c78340328e6112a1
  F test/null.test a8b09b8ed87852742343b33441a9240022108993
  F test/openv2.test 0d3040974bf402e19b7df4b783e447289d7ab394
  F test/oserror.test 50417780d0e0d7cd23cf12a8277bb44024765df3
- F test/pager1.test 20a99956dbe336cbe98cdcab9c03bb137a21d820
 -F test/pager1.test eb6d64d2e148dc4bfc6420605bee3717e2d5f10c
++F test/pager1.test 34fb695debe94ba64d9b949cc6da11dbcc786e3d
  F test/pager2.test 745b911dde3d1f24ae0870bd433dfa83d7c658c1
  F test/pager3.test 3856d9c80839be0668efee1b74811b1b7f7fc95f
 -F test/pagerfault.test 452f2cc23e3bfcfa935f4442aec1da4fe1dc0442
 +F test/pagerfault.test a15ef77c8495882d7debb43794e87b6e46174c8a
  F test/pagerfault2.test 1f79ea40d1133b2683a2f811b00f2399f7ec2401
  F test/pagerfault3.test f16e2efcb5fc9996d1356f7cbc44c998318ae1d7
  F test/pageropt.test 9191867ed19a2b3db6c42d1b36b6fbc657cd1ab0
  F test/pagesize.test 1dd51367e752e742f58e861e65ed7390603827a0
  F test/pcache.test 065aa286e722ab24f2e51792c1f093bf60656b16
  F test/pcache2.test a83efe2dec0d392f814bfc998def1d1833942025
- F test/permutations.test 2b5a1b64a8e5114757457fbce9010387d1fe7682
+ F test/permutations.test dbda172249564f43ec556108a704581044c57dbd
 -F test/pragma.test c51c148defe32bf4a419a522f95d26838d5cf677
 +F test/pragma.test e284a28b6e9debfb8b55d5413b7c27996e3ae2cd
  F test/pragma2.test 3a55f82b954242c642f8342b17dffc8b47472947
  F test/printf.test ec9870c4dce8686a37818e0bf1aba6e6a1863552
  F test/progress.test 5b075c3c790c7b2a61419bc199db87aaf48b8301
@@@ -997,7 -999,7 +1004,7 @@@ F tool/tostr.awk e75472c2f98dd76e06b8c9
  F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
  F tool/warnings-clang.sh 9f406d66e750e8ac031c63a9ef3248aaa347ef2a
  F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
- P 504bf4908618f4dc8c9d67380934016b311ca6d0 bc03d99a78e90c02b69037e5f5f81537b5a3ac60
- R 9f70d7baa8cf86bac27841be078e7989
- U dan
- Z c152a2266757c87b472ab8b2b09e3ebe
 -P 196ca3a8b007b9f792e969893d981f6c5aa2fccc
 -R d4cee1bded14d0c2a35aac2c2a8ea01d
++P f999197b75465a1f71ac1dab8f22ba2167fc0c67 f9a7e179cbbeeab5e57bbf392bef89750215546b
++R 82541a9eaf4a147ff8f864155ac5fc2d
+ U drh
 -Z c8013359e2c16f7dbb75906fb62e335f
++Z ccad7cece0bf00c1026435d33943b52d

diff --cc manifest.uuid
index ff34800e0ca2e1273c63fb36c2708c7b079a14a9,360fef573d0159b4077b1bc306b4a25722ee986c..a7a37f9c0b2ac79b741e99e95d34ede2722b8d71
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- f999197b75465a1f71ac1dab8f22ba2167fc0c67
 -f9a7e179cbbeeab5e57bbf392bef89750215546b
++18ec60cacd37a70d598ac1af5e50faffa73bb134

diff --cc src/btree.c
Simple merge

diff --cc src/func.c
Simple merge

diff --cc src/os_win.c
Simple merge

diff --cc src/pager.c
Simple merge

diff --cc src/select.c
Simple merge

diff --cc src/sqlite.h.in
Simple merge

diff --cc src/sqliteInt.h
Simple merge

diff --cc src/test1.c
Simple merge

diff --cc src/vdbe.c
Simple merge

diff --cc test/pager1.test
Simple merge