Update the apple-osx branch so that it includes all of the latest trunk

changes.

FossilOrigin-Name: b72f07b4a2cf62ac1b52d432f13057d5d93a4ec4

diff --cc ext/rtree/rtree.c
Simple merge

diff --cc manifest
index 648d798026c3539b9749c2c01e8e6fdd03e52b66,1c11ae957b87609659613aaea96f280dbd08de8f..2da522d95ab23bd0c587824a9141942d4b08a769
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,7 -1,7 +1,7 @@@
- C Cherrypick\scommit\s[1d5e744cc6]\sfrom\sthe\strunk\sin\sorder\sto\savoid\sleaving\sa\sfile-ddescriptor\sopen\sin\stest\sscripts\scapi3.test\sand\scapi3c.test.
- D 2012-04-03T19:43:07.319
 -C Fix\sharmless\scompiler\swarnings\son\sx64\sMSVC,\smostly\sin\stest\scode,\sbut\salso\sin\ntclsqlite.c\sand\sin\sthe\sFTS4\smodule.
 -D 2012-04-19T18:04:28.392
++C Update\sthe\sapple-osx\sbranch\sso\sthat\sit\sincludes\sall\sof\sthe\slatest\strunk\nchanges.
++D 2012-04-19T20:43:54.884
  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
@@@ -86,30 -86,27 +86,30 @@@ F ext/icu/README.txt bf8461d8cdc6b8f514
  F ext/icu/icu.c eb9ae1d79046bd7871aa97ee6da51eb770134b5a
  F ext/icu/sqliteicu.h 728867a802baa5a96de7495e9689a8e01715ef37
  F ext/rtree/README 6315c0d73ebf0ec40dedb5aa0e942bc8b54e3761
- F ext/rtree/rtree.c 4e69b25ba3ec9ce229dbbd388d5281e1486b3bef
 -F ext/rtree/rtree.c 73502e5336162fdc8f5d1c4bdd4ec6b1299c2f2a
++F ext/rtree/rtree.c d918e173075fbb3699c5ecfa1a89ef2b9c978b37
  F ext/rtree/rtree.h 834dbcb82dc85b2481cde6a07cdadfddc99e9b9e
- F ext/rtree/rtree1.test 28e1b8da4da98093ce3210187434dd760a8d89d8
+ F ext/rtree/rtree1.test e474a2b5eff231496dbd073fe67e5fbaf7f444c9
  F ext/rtree/rtree2.test acbb3a4ce0f4fbc2c304d2b4b784cfa161856bba
  F ext/rtree/rtree3.test a494da55c30ee0bc9b01a91c80c81b387b22d2dc
- F ext/rtree/rtree4.test 0061e6f464fd3dc6a79f82454c5a1c3dadbe42af
- F ext/rtree/rtree5.test ce3d7ccae2cfd9d2e1052b462424964c9bdcda12
- F ext/rtree/rtree6.test 0b380bd9af93f3bc496eef42502a336f58949c1b
- F ext/rtree/rtree7.test bcb647b42920b3b5d025846689147778485cc318
+ F ext/rtree/rtree4.test c8fe384f60ebd49540a5fecc990041bf452eb6e0
+ F ext/rtree/rtree5.test 9a229678a00f40e6aedb40cb3a07ec5444af892c
+ F ext/rtree/rtree6.test 3ff9113b4a872fa935309e3511cd9b7cdb4d2472
+ F ext/rtree/rtree7.test 1fa710b9e6bf997a0c1a537b81be7bb6fded1971
  F ext/rtree/rtree8.test 9772e16da71e17e02bdebf0a5188590f289ab37d
- F ext/rtree/rtree9.test df9843d1a9195249c8d3b4ea6aedda2d5c73e9c2
+ F ext/rtree/rtree9.test d86ebf08ff6328895613ed577dd8a2a37c472c34
  F ext/rtree/rtreeA.test ace05e729a36e342d40cf94e9efc7b4723d9dcdf
- F ext/rtree/rtreeB.test b1916a9cecb86b02529c4cc5a546e8d6e7ff10da
+ F ext/rtree/rtreeB.test 983e567b49b5dca165940f66b87e161aa30e82b2
  F ext/rtree/rtree_perf.tcl 6c18c1f23cd48e0f948930c98dfdd37dfccb5195
  F ext/rtree/rtree_util.tcl 06aab2ed5b826545bf215fff90ecb9255a8647ea
- F ext/rtree/sqlite3rtree.h 1af0899c63a688e272d69d8e746f24e76f10a3f0
+ F ext/rtree/sqlite3rtree.h c34c1e41d1ab80bb8ad09aae402c9c956871a765
  F ext/rtree/tkt3363.test 142ab96eded44a3615ec79fba98c7bde7d0f96de
  F ext/rtree/viewrtree.tcl eea6224b3553599ae665b239bd827e182b466024
 +F ext/sqlrr/README.txt 4239030e73023e72a2e727808cd433577d5bf730
 +F ext/sqlrr/sqlrr.c 8d1e6571cd6a6beabdb5bcdfe3a0e723b914db41
 +F ext/sqlrr/sqlrr.h 09e4f8929ad9bc2638732c0cc0db5eef8c417824
  F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
  F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8
 -F main.mk a80771d44176a0c744d9d4e048497e7ed0b4040d
 +F main.mk 92babfc15d7838f01b4bf1cc14ea8d9c06772c2b
  F mkdll.sh 7d09b23c05d56532e9d44a50868eb4b12ff4f74a
  F mkextu.sh 416f9b7089d80e5590a29692c9d9280a10dbad9f
  F mkextw.sh 4123480947681d9b434a5e7b1ee08135abe409ac
@@@ -129,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 748ff64c56e6aee3d60200321e6b86c1b9a777b8
 -F src/btree.c df800f10896bc2ddaa1125c532d6e7a7b9efc532
++F src/btree.c 207d4859d759074e6101bfed65cf87cdd3f794a8
  F src/btree.h 48a013f8964f12d944d90e4700df47b72dd6d923
- F src/btreeInt.h 26d8ca625b141927fe6620c1d2cf58eaf494ca0c
+ F src/btreeInt.h 38a639c0542c29fe8331a221c4aed0cb8686249e
  F src/build.c 987c6933ea170e443dc6a79d52f8d2506206b12b
- F src/callback.c 0425c6320730e6d3981acfb9202c1bed9016ad1a
+ F src/callback.c 0cb4228cdcd827dcc5def98fb099edcc9142dbcd
  F src/complete.c dc1d136c0feee03c2f7550bafc0d29075e36deac
  F src/ctime.c a9c26822515f81ec21588cbb482ca6724be02e33
  F src/date.c 067a81c9942c497aafd2c260e13add8a7d0c7dd4
  F src/delete.c 4c20ea4f6213b3bc1c6a510586864b679946e05e
- F src/expr.c ebb0e2b21379d4ec0c5c2c7c952784cb300c8436
+ F src/expr.c eefabaa4a3dc67309a754eb0eab1a163ff4c2bf3
  F src/fault.c 160a0c015b6c2629d3899ed2daf63d75754a32bb
  F src/fkey.c 657212460bf5cfd3ae607d12ea62092844c227b5
 -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 93eb9542ae1376d9317a7c8335d7e379f010aa76
+ F src/insert.c 0bbffe75c254c62a5686ab5e7f88e29235e16174
  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 2ba24071c42849fde838c32f1b508712c51dd758
  F src/malloc.c 15afac5e59b6584efe072e9933aefb4230e74f97
  F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
  F src/mem1.c b3677415e69603d6a0e7c5410a1b3731d55beda1
@@@ -170,64 -167,63 +170,64 @@@ 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 5e6ead4f8f4236f0ed016ca4518300985daddf7e
 -F src/os_unix.c 424d46e0edab969293c2223f09923b2178171f47
 -F src/os_win.c 5e9e933a412ab35de2a6506b3c6a8295b31b309e
 -F src/pager.c 85988507fa20acc60defb834722eddf4633e4aeb
++F src/os_unix.c d1978ba892240d106f5c45a9ec588dfa54431df5
 +F src/os_win.c 12e76b4aa5426022939f92e894a5c20dd40be7f4
 +F src/pager.c ce4fde5951bf71b4f5316ff5afd0219ff7e99b3f
  F src/pager.h ef1eaf8593e78f73885c1dfac27ad83bee23bdc5
  F src/parse.y eb054bb40a5bf90d3422a01ed0e5df229461727a
  F src/pcache.c f8043b433a57aba85384a531e3937a804432a346
  F src/pcache.h 1b5dcc3dc8103d03e625b177023ee67764fa6b7c
  F src/pcache1.c b30b1c35908346ecc43d8d9d17f2ddf6817f8f60
 -F src/pragma.c e708b3bb5704605816f617e0b1d63a5488060715
 -F src/prepare.c ec4989f7f480544bdc4192fe663470d2a2d7d61e
 +F src/pragma.c 29db41fc84bd7853d6c7ef85f9f8bd56a8be4320
 +F src/prepare.c 4450a714a7ebb4b0ce4159087338e1159d083885
  F src/printf.c 7ffb4ebb8b341f67e049695ba031da717b3d2699
  F src/random.c cd4a67b3953b88019f8cd4ccd81394a8ddfaba50
- F src/resolve.c 3d3e80a98f203ac6b9329e9621e29eda85ddfd40
- F src/rowset.c 69afa95a97c524ba6faf3805e717b5b7ae85a697
- F src/select.c 36d5ed5c4504fd37c024141ce2b699148b231a8d
- F src/shell.c abf18d6ee54f2631860a98fdd7ab1327f470db67
- F src/sqlite.h.in 8714ac9f594717d667fb0c1149f97332bebce8e0
+ F src/resolve.c 969ec2bc52db1b068054ecf5ddc74f244102a71d
+ F src/rowset.c f6a49f3e9579428024662f6e2931832511f831a1
 -F src/select.c d7b9018b7dd2e821183d69477ab55c39b8272335
++F src/select.c cf2f8f771bab6417e51a0f17b086a87bb74d624c
+ F src/shell.c 11185a9a4574f363bd4268a2780d37480ae00040
 -F src/sqlite.h.in 4338f299fc83dada8407358d585c0e240ecb76a3
++F src/sqlite.h.in c8d096addc2814b900ee2e2b3b1f22ba56502d5f
 +F src/sqlite3_private.h 77bebe843a3eabfb7994990aab780d34d25819c7
  F src/sqlite3ext.h 6904f4aadf976f95241311fbffb00823075d9477
- F src/sqliteInt.h efee04f7c9e000b77d89f87baf77397b4025246c
 -F src/sqliteInt.h c5e917c4f1453f3972b1fd0c81105dfe4f09cc32
++F src/sqliteInt.h ec90f0d797bbc93dd849629f18513b57bfd9a787
  F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d
  F src/status.c 35939e7e03abf1b7577ce311f48f682c40de3208
  F src/table.c 2cd62736f845d82200acfa1287e33feb3c15d62e
- F src/tclsqlite.c 086dfdd72e5892de223968a258e1ccbd9693e717
- F src/test1.c a23a59fb8aaa49f94fe5d214907618264f05b923
- F src/test2.c 711555927f1f7e8db9aab86b512bc6934a774abe
- F src/test3.c f82399ec50d9cd7378bf9d6db6c1409d5e77b042
+ F src/tclsqlite.c fe5406573e1527957e00dcaf51edd9d8bd31b918
 -F src/test1.c a808bfa548a501b513579bdbaf83901c98e059c9
++F src/test1.c e1163ebedf8b5c95554ea15529700e1330e6210a
+ F src/test2.c 4178056dd1e7d70f954ad8a1e3edb71a2a784daf
+ F src/test3.c 3c3c2407fa6ec7a19e24ae23f7cb439d0275a60d
  F src/test4.c d1e5a5e904d4b444cf572391fdcb017638e36ff7
  F src/test5.c a6d1ac55ac054d0b2b8f37b5e655b6c92645a013
- F src/test6.c 3329df2dbc0293031d763947ec08c9eef982ef1d
+ F src/test6.c 417e1e214734393c24a8ee80b41485a9c4169123
  F src/test7.c 2e0781754905c8adc3268d8f0967e7633af58843
- F src/test8.c 61b41d79509a479dec1ac32b6d4209b27c4b1ba5
+ F src/test8.c 5ecbffe6712da81d5d10454e9d77d6c5bac95fe8
  F src/test9.c bea1e8cf52aa93695487badedd6e1886c321ea60
  F src/test_async.c 0612a752896fad42d55c3999a5122af10dcf22ad
  F src/test_autoext.c 30e7bd98ab6d70a62bb9ba572e4c7df347fe645e
 -F src/test_backup.c c129c91127e9b46e335715ae2e75756e25ba27de
 +F src/test_backup.c 64fd6173ad99daade1227aa17c3ca0d18fa5e5fa
  F src/test_btree.c 47cd771250f09cdc6e12dda5bc71bc0b3abc96e2
- F src/test_config.c 7f1aa0d93f76c2657bfa00a54e5837ab9af1a912
 -F src/test_config.c 0de329e736eb4aa5845069bed630e5c72f012264
++F src/test_config.c 5fb0e0d01b3219895e3475db9af27e701585ec77
  F src/test_demovfs.c 20a4975127993f4959890016ae9ce5535a880094
  F src/test_devsym.c e7498904e72ba7491d142d5c83b476c4e76993bc
- F src/test_func.c 6232d722a4ddb193035aa13a03796bf57d6c12fd
- F src/test_fuzzer.c 3703a190bd79a43e5f097d59c73ab38961d14872
- F src/test_hexio.c c4773049603151704a6ab25ac5e936b5109caf5a
+ F src/test_func.c 090f2c3339e85c2c964435f99aed6f3da9d59525
+ F src/test_fuzzer.c 1d26aa965120420bc14807da29d4d4541bfa6148
+ F src/test_hexio.c abfdecb6fa58c354623978efceb088ca18e379cd
  F src/test_init.c 3cbad7ce525aec925f8fda2192d576d47f0d478a
  F src/test_intarray.c d879bbf8e4ce085ab966d1f3c896a7c8b4f5fc99
  F src/test_intarray.h 489edb9068bb926583445cb02589344961054207
- F src/test_journal.c b964473ff1b7a65626763f068fa6a810385d1fbf
+ F src/test_journal.c f5c0a05b7b3d5930db769b5ee6c3766dc2221a64
  F src/test_loadext.c df586c27176e3c2cb2e099c78da67bf14379a56e
  F src/test_malloc.c 3f5903a1528fd32fe4c472a3bd0259128d8faaef
- F src/test_multiplex.c 30ca0348953abd3add46fe4ee19e3f9e669b7e56
+ F src/test_multiplex.c 66dcfca001ee22f04ef31ad353772ed05a017e53
  F src/test_multiplex.h e99c571bc4968b7a9363b661481f3934bfead61d
  F src/test_mutex.c a6bd7b9cf6e19d989e31392b06ac8d189f0d573e
- F src/test_onefile.c 5e1382e7844c703c77c4c2aee82f8359555b5a8e
- F src/test_osinst.c 7f790ac89c5a585d51b341274d9691c3391e0923
+ F src/test_onefile.c 0396f220561f3b4eedc450cef26d40c593c69a25
+ F src/test_osinst.c 90a845c8183013d80eccb1f29e8805608516edba
  F src/test_pcache.c a5cd24730cb43c5b18629043314548c9169abb00
- F src/test_quota.c a545115f837da4ef32f6b5578f147b44cfb13fd7
- F src/test_quota.h 9ffa1d3ad6d0a6a24e8670ea64b909c717ec3358
- F src/test_rtree.c a2eebb68c0f1463918cdfbe603cb2e869c551038
+ F src/test_quota.c 9d6be9cd3bb132df2b964193b6a4ec850f50a210
+ F src/test_quota.h ee5da2ae7f84d1c8e0e0e2ab33f01d69f10259b5
 -F src/test_rtree.c aba603c949766c4193f1068b91c787f57274e0d9
++F src/test_rtree.c a1bbfc30f14d2bad2f93dbea7dcc697c97a40c66
  F src/test_schema.c 8c06ef9ddb240c7a0fcd31bc221a6a2aade58bf0
  F src/test_server.c 2f99eb2837dfa06a4aacf24af24c6affdf66a84f
  F src/test_stat.c d7035cfcc0ff1f93c000b621f36524318e004e11
@@@ -245,21 -241,21 +245,21 @@@ F src/update.c d3076782c887c10e88299655
  F src/utf.c 890c67dcfcc7a74623c95baac7535aadfe265e84
  F src/util.c 4f6cfad661b2e3454b0cdd5b1b9d39a54942d0e3
  F src/vacuum.c bfd53f9bd20a8fdb70b0fa8e77182b866875c0d8
- F src/vdbe.c bcf472eecfe0bab9e7be7b615aa71c16cb27c6ea
 -F src/vdbe.c e1d26b98288889c22f00cf4851ec351ee67ad8b9
++F src/vdbe.c baed8c1e0525abfdaec81bdb3a8d0174ffcb7f68
  F src/vdbe.h 18f581cac1f4339ec3299f3e0cc6e11aec654cdb
  F src/vdbeInt.h 6ff4180a05683566a8835d12f7ec504b22932c82
 -F src/vdbeapi.c 3662b6a468a2a4605a15dfab313baa6dff81ad91
 -F src/vdbeaux.c d52c8a424fdd4b1d5cf1ac93cc7cd20da023ec5c
 +F src/vdbeapi.c bf1f632719ee596d43ccf6c2ed68ff8911f5b376
- F src/vdbeaux.c dfaa1694e43aea6470a53e50a318fe9f54d63374
++F src/vdbeaux.c 88b9df24bcab179fbe7a39df7b3e17cce6f372d7
  F src/vdbeblob.c 32f2a4899d67f69634ea4dd93e3f651936d732cb
- F src/vdbemem.c fb0ac964ccbcd94f595eb993c05bfd9c52468a4a
+ F src/vdbemem.c cb55e84b8e2c15704968ee05f0fae25883299b74
  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 b5ba968e7d5a17f745b78b3acde2214ec985d21e
 +F src/wal.h a8ade3069ab75e3c79e9ca067a5ac7e1dbaf93a6
  F src/walker.c 3112bb3afe1d85dc52317cb1d752055e9a781f8f
  F src/where.c 2112422a404dcca5d47f6630bdf180bccd36c62b
 -F test/8_3_names.test 631ea964a3edb091cf73c3b540f6bcfdb36ce823
 +F test/8_3_names.test 0ed0f6711fefac33829ef9f1d6ca3c56c48ef1c7
  F test/aggerror.test a867e273ef9e3d7919f03ef4f0e8c0d2767944f2
  F test/alias.test 4529fbc152f190268a15f9384a5651bbbabc9d87
  F test/all.test 52fc8dee494092031a556911d404ca30a749a30b
@@@ -715,9 -711,9 +716,9 @@@ F test/speed4.test abc0ad3399dcf9703abe
  F test/speed4p.explain 6b5f104ebeb34a038b2f714150f51d01143e59aa
  F test/speed4p.test 0e51908951677de5a969b723e03a27a1c45db38b
  F test/sqllimits1.test b1aae27cc98eceb845e7f7adf918561256e31298
 -F test/stat.test 08e8185b3fd5b010c90d7ad82b9dd4ea1cbf14b0
 -F test/stmt.test 25d64e3dbf9a3ce89558667d7f39d966fe2a71b9
 +F test/stat.test 4ce96d67f6a0bc9647a042c7140cf1c56e049a69
 +F test/stmt.test 78a6764439cfa5abdcbf98d4d084739e81eeec4f
- F test/subquery.test b524f57c9574b2c0347045b4510ef795d4686796
+ F test/subquery.test c5e0d183f1ae6251453338a465b32ae11326e0fa
  F test/subquery2.test edcad5c118f0531c2e21bf16a09bbb105252d4cd
  F test/subselect.test d24fd8757daf97dafd2e889c73ea4c4272dcf4e4
  F test/substr.test 18f57c4ca8a598805c4d64e304c418734d843c1a
@@@ -1002,9 -998,9 +1003,9 @@@ F tool/symbols-mingw.sh 4dbcea7e7476830
  F tool/symbols.sh fec58532668296d7c7dc48be9c87f75ccdb5814f
  F tool/tostr.awk e75472c2f98dd76e06b8c9c1367f4ab07e122d06
  F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
- F tool/warnings-clang.sh 9f406d66e750e8ac031c63a9ef3248aaa347ef2a
+ F tool/warnings-clang.sh a8a0a3babda96dfb1ff51adda3cbbf3dfb7266c2
  F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
- P 0c0150f2a349460d685e63be1a747d2bfbe5c8c4
- R 4a632657509f5ed1cfb05420592ec8ff
- U dan
- Z fcb9e7416b7e86cf09e8dde2e964f1f0
 -P de3f7187eb2ff24683a1854ae523e7d30c290893
 -R 93ef8dac16d8fdeed30c697eb50ecf5c
++P 86b8481be7e76cccc92d14ce762d21bfb69504af 3281972eaa46cb57fd9f0387063f47430dc0a3b4
++R 7ff10cf8ec4e430ab15c15c36f6c9d99
+ U drh
 -Z 1cd21a56051e90b0bfc0e250c8d84f38
++Z e85d9933f100757e607594cd6fe7ac76

diff --cc manifest.uuid
index f79a3ec6b552ce0f9a09dfe027fc844893a4e52c,50f325473a3c3096b12bf9ce8aac32e2cf6d4489..f1ab5f9d04d0511898ef77b35d37d9909cbe484c
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 86b8481be7e76cccc92d14ce762d21bfb69504af
 -3281972eaa46cb57fd9f0387063f47430dc0a3b4
++b72f07b4a2cf62ac1b52d432f13057d5d93a4ec4

diff --cc src/btree.c
Simple merge

diff --cc src/os_unix.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/test_config.c
Simple merge

diff --cc src/test_rtree.c
Simple merge

diff --cc src/vdbe.c
Simple merge

diff --cc src/vdbeaux.c
Simple merge