Merge the latest trunk changes (PRAGMA busy_timeout and the ORDER BY

query planner enhancements) into the apple-osx branch.

FossilOrigin-Name: 6a5c59dd7e0de9b5a2136f1c333afe522f724a71

diff --cc Makefile.in
Simple merge

diff --cc main.mk
Simple merge

diff --cc manifest
index 82abb063a9784b106663e5c65a7b27d50a6722ae,6358e6d360505c65877ac921481867330f5712ac..4fce30a1a741978583fb178d174862b41b1b3cf2
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,12 -1,12 +1,12 @@@
- C Merge\sin\slatest\strunk\schanges.
- D 2012-08-31T14:10:24.896
 -C Query\splanner\senhancements\sto\sbe\smore\sagressive\sabout\soptimizing\sout\sORDER\sBY\nclauses\s-\sin\sparticular\sthe\squery\splanner\snow\shas\sthe\sability\sto\somit\sORDER\sBY\nclauses\sthat\sspan\smultiple\stables\sin\sa\sjoin.
 -D 2012-09-28T00:44:28.903
++C Merge\sthe\slatest\strunk\schanges\s(PRAGMA\sbusy_timeout\sand\sthe\sORDER\sBY\nquery\splanner\senhancements)\sinto\sthe\sapple-osx\sbranch.
++D 2012-09-28T10:57:42.795
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
- F Makefile.in c2d205d441ae3b96b2df35a2bd3e3dcef697b55a
 -F Makefile.in 5f4f26109f9d80829122e0e09f9cda008fa065fb
++F Makefile.in 535aaf4b82ce03a91c9b7b31367f160401cce226
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
- F Makefile.msc f00ec5dc2e78eb63d32c3125ab7a999aa7fcf924
- F Makefile.vxworks 879f034a64062a364b21000266bbd5bc6e0c19b9
+ F Makefile.msc 1102ce2c75965b9b5534efce380007ffcb08c52e
+ F Makefile.vxworks b18ad88e9a8c6a001f5cf4a389116a4f1a7ab45f
  F README cd04a36fbc7ea56932a4052d7d0b7f09f27c33d6
- F VERSION a71848df48082f1d6585d4b0819d530fc455485d
+ F VERSION edab4af5a4623f8198833ea481ce98ab53750a8d
  F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
  F addopcodes.awk 17dc593f791f874d2c23a0f9360850ded0286531
  F art/sqlite370.eps aa97a671332b432a54e1d74ff5e8775be34200c2
@@@ -101,12 -101,9 +101,12 @@@ F ext/rtree/rtree_util.tcl 06aab2ed5b82
  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 19df6c439d54aa254a1e372bb5c453540700a3e0
 -F main.mk 7b60c2663388270258f01b59fbf8b9bd78f946bf
++F main.mk b96c4ca76db96d169006c53867410c455918ce40
  F mkdll.sh 7d09b23c05d56532e9d44a50868eb4b12ff4f74a
  F mkextu.sh 416f9b7089d80e5590a29692c9d9280a10dbad9f
  F mkextw.sh 4123480947681d9b434a5e7b1ee08135abe409ac
@@@ -126,29 -121,29 +124,29 @@@ F src/auth.c 523da7fb4979469955d822ff92
  F src/backup.c 5b31b24d6814b11de763debf342c8cd0a15a4910
  F src/bitvec.c 26675fe8e431dc555e6f2d0e11e651d172234aa1
  F src/btmutex.c 976f45a12e37293e32cae0281b15a21d48a8aaa7
 -F src/btree.c 9cf6de113d23d47967df24b8d8ce6501c879d7e6
 +F src/btree.c 64acbd5fd89629d2f52d5d6f851cc534d2a66fbe
  F src/btree.h 4aee02e879211bfcfd3f551769578d2e940ab6c2
  F src/btreeInt.h 4e5c2bd0f9b36b2a815a6d84f771a61a65830621
- F src/build.c a3b700afd475e6387da59be6f2e86161e80d6d87
+ F src/build.c c4555e16f8ccdadb2616014c617ed8166c5a93f7
  F src/callback.c 0cb4228cdcd827dcc5def98fb099edcc9142dbcd
  F src/complete.c dc1d136c0feee03c2f7550bafc0d29075e36deac
- F src/ctime.c 500d019da966631ad957c37705642be87524463b
+ F src/ctime.c 72a70dcfda75d3a1f81041ce4573e7afddcd8e4e
  F src/date.c 067a81c9942c497aafd2c260e13add8a7d0c7dd4
- F src/delete.c 335f36750dc6ac88d580aa36a6487459be9889de
- F src/expr.c 217840a107dcc1e5dbb57cea311daad04bedbb9a
+ F src/delete.c 4f7d773ec44b7db22b30ec9144f58a69154e09b7
+ F src/expr.c 4de967b85f577ba00a7cdcb53d22070def6198db
  F src/fault.c 160a0c015b6c2629d3899ed2daf63d75754a32bb
- F src/fkey.c 9c77d842dc9961d92a06a65abb80c64ef1750296
- F src/func.c 32552a2c57cf2ed3ca7f8aa3e2a3101da021a4dd
- F src/global.c 4cfdca5cb0edd33c4d021baec4ede958cb2c793b
+ F src/fkey.c c82a04e7a92bb728f9ab972b76590403283be2af
 -F src/func.c cbb90dc84b22eea25caf39528d342279e61b8898
++F src/func.c 8dea4e82d536997cf4aa85d6573479995e18f38c
+ F src/global.c fb44b11e02e06c995e6ed6642509edd23599d584
  F src/hash.c a4031441741932da9e7a65bee2b36b5d0e81c073
  F src/hash.h 2894c932d84d9f892d4b4023a75e501f83050970
  F src/hwtime.h d32741c8f4df852c7d959236615444e2b1063b08
- F src/insert.c b090d0a9fb9ff2dbdeaf66aedccf98cd13b1af60
+ F src/insert.c 6e2aa7fbb5d4c5f34d412772751ed0aff0b9e87b
  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 f076eae7069da190d22175b8cf0823a6500e49d5
 -F src/main.c 5249486037f88e765cce7c4870846dc5a2cd2ed1
++F src/main.c 6fb68d1b6c7dd9188f3ef0182ca1a3ebd1fa0b42
  F src/malloc.c fe085aa851b666b7c375c1ff957643dc20a04bf6
  F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
  F src/mem1.c 437c7c4af964895d4650f29881df63535caaa1fa
@@@ -162,34 -157,34 +160,35 @@@ 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.c 4c8c8d72a6c58ad2fde4865783e8ae26b494a85e
  F src/os.h 027491c77d2404c0a678bb3fb06286f331eb9b57
  F src/os_common.h 92815ed65f805560b66166e3583470ff94478f04
 -F src/os_unix.c 69b2fe66316524eebf5f1ce85c1fdfe2952307e9
 -F src/os_win.c 90c7a1fe2698867555ba4266f5bd436c85d0d1dc
 -F src/pager.c 9c59818c480261c1c5a4772532e0df92a27745a1
 -F src/pager.h 8b8c9bc065a3c66769df8724dfdf492ee1aab3c5
 +F src/os_unix.c 0482b132e8f1617276661276dd49e6b0ebe1db49
- F src/os_win.c 4ee163bab365408d971045dd71dd0c05491b70c7
- F src/pager.c 85fec76b7eabbef19d86cb825e1343751d40aa4e
++F src/os_win.c 1e6b79bea91ee0000ed59aec8cc4935342529229
++F src/pager.c 403e8cfae0e0e798e147ec6b04ee712301b54158
 +F src/pager.h 491e782fbefc83e115f85588987ebb7d00d9fde6
  F src/parse.y f29df90bd3adc64b33114ab1de9fb7768fcf2099
  F src/pcache.c f8043b433a57aba85384a531e3937a804432a346
  F src/pcache.h 1b5dcc3dc8103d03e625b177023ee67764fa6b7c
  F src/pcache1.c 9fd22671c270b35131ef480bbc00392b8b5f8ab9
- F src/pragma.c bf2a8023aa8bb251fc0660eb5560bc6efec530fb
- F src/prepare.c 5e2babd80c5771354ffc1eddfea41fc08e43ffed
 -F src/pragma.c 7f5a0fa6dead752d9af3a1e1d16bace81d22ef95
 -F src/prepare.c 931ad0d852a0df48f79adcba6ce79ca5f475625c
++F src/pragma.c 2b556a8a7afcb9e5c17f1901d63413f15c75c4a7
++F src/prepare.c 417a6a758be68de72b34f526d554171bf240e5da
  F src/printf.c 4a9f882f1c1787a8b494a2987765acf9d97ac21f
  F src/random.c cd4a67b3953b88019f8cd4ccd81394a8ddfaba50
  F src/resolve.c 9e28280ec98035f31900fdd1db01f86f68ca6c32
  F src/rowset.c 64655f1a627c9c212d9ab497899e7424a34222e0
- F src/select.c c5dbb1351a82419fd3b92806a38d1f534e5911a4
- F src/shell.c 87953c5d9c73d9494db97d1607e2e2280418f261
- F src/sqlite.h.in 9e7a9011bbb825777382ea8d740c942a9a382e1b
 -F src/select.c 75c5e37cc882c468383c9d9e07496b9a16cfae3e
++F src/select.c 80633ba7505bf830597edafbeae7b6016fc635ed
+ F src/shell.c 8ee5a3cb502e2d574f97b43972e6c1e275e7bec7
 -F src/sqlite.h.in cbe846facaba903654b4136c97e7f57b3ac0bac7
++F src/sqlite.h.in f157b58f6876dbfc23d5e64ea2a7eb01d33c02d6
+ F src/sqlite3.rc fea433eb0a59f4c9393c8e6d76a6e2596b1fe0c0
 +F src/sqlite3_private.h a81a9c5f97c095cc3e86914a05f8fabe0011f4a1
  F src/sqlite3ext.h 6904f4aadf976f95241311fbffb00823075d9477
- F src/sqliteInt.h 0cd30dc6f6a44dc309c5754770cdcfa5e52f110a
 -F src/sqliteInt.h c29395d6e68cfbcb2661787ae4820e5e256c916a
++F src/sqliteInt.h 44d0917a4fa806cfa51a3f4737b13845fdc4e569
  F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d
  F src/status.c 35939e7e03abf1b7577ce311f48f682c40de3208
  F src/table.c 2cd62736f845d82200acfa1287e33feb3c15d62e
- F src/tclsqlite.c fe5406573e1527957e00dcaf51edd9d8bd31b918
- F src/test1.c 23fdc06ec3bd0809eafb7168ceb165e3b8a50b8a
+ F src/tclsqlite.c e4de2458b3ef38fdd0498bc4e5ea5367a241b0f3
 -F src/test1.c 0354b555639c92d2a63c0ad4e74ed152ba47e604
++F src/test1.c f435cf69dc915a692c37862e5abcab0f79f550e8
  F src/test2.c 4178056dd1e7d70f954ad8a1e3edb71a2a784daf
  F src/test3.c 3c3c2407fa6ec7a19e24ae23f7cb439d0275a60d
  F src/test4.c bf9fa9bece01de08e6f5e02314e4af5c13590dfa
@@@ -222,12 -217,12 +221,12 @@@ F src/test_osinst.c 90a845c8183013d80ec
  F src/test_pcache.c a5cd24730cb43c5b18629043314548c9169abb00
  F src/test_quota.c 8ab295092c70903ca6f3209fa4c75f5cb6c1bf8e
  F src/test_quota.h 8761e463b25e75ebc078bd67d70e39b9c817a0cb
 -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_spellfix.c 0a5b5b27fc48b00f9e6fd6700f9535de538a964f
+ F src/test_spellfix.c 76dd8d3111d2f5354c374f71fa23b752bd0b029c
  F src/test_stat.c d1569c7a4839f13e80187e2c26b2ab4da2d03935
 -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
@@@ -238,24 -233,24 +237,24 @@@ F src/test_wsd.c 41cadfd9d97fe8e3e4e44f
  F src/tokenize.c 1e86210d3976717a19238ea7b047fac481fe8c12
  F src/trigger.c 3f258307040173aff383eb23fb74c44fe829078c
  F src/update.c 28d2d098b43a2c70dae399896ea8a02f622410ef
- F src/utf.c 890c67dcfcc7a74623c95baac7535aadfe265e84
+ F src/utf.c 8d819e2e5104a430fc2005f018db14347c95a38f
  F src/util.c 0af2e515dc0dabacec931bca39525f6c3f1c5455
  F src/vacuum.c 587a52bb8833d7ac15af8916f25437e2575028bd
- F src/vdbe.c 7eee10a773f18fb636c33bd62220e6e8ff97fbd0
 -F src/vdbe.c 31523df2b986fc6c959dd54ca640ba865884641b
++F src/vdbe.c fcb5bb6f48d8ac9079e1b0fddbc680c91fe95c68
  F src/vdbe.h 18f581cac1f4339ec3299f3e0cc6e11aec654cdb
- F src/vdbeInt.h 986b6b11a13c517337355009e5438703ba5b0a40
- F src/vdbeapi.c 31936c1666c789cc8eac1872f681ad38867e8c47
- F src/vdbeaux.c a3423091cf6a3fdf4e67a5a211070ef9728e7880
+ F src/vdbeInt.h 573a43ab5697b648a1e8f3dfc7d8667d5ca55729
 -F src/vdbeapi.c 4c2418161cf45392ba76a7ca92f9a5f06b96f89c
 -F src/vdbeaux.c fac025c798ad19070451b41eddc5dcd4696fdd1e
++F src/vdbeapi.c e05707f39ab3691422b59b72188c004154eb6417
++F src/vdbeaux.c a709b258b800bcfddc69a9d262fe46f88fea63b1
  F src/vdbeblob.c 32f2a4899d67f69634ea4dd93e3f651936d732cb
  F src/vdbemem.c cb55e84b8e2c15704968ee05f0fae25883299b74
  F src/vdbesort.c 0dc1b274dcb4d4c8e71b0b2b15261f286caba39b
 -F src/vdbetrace.c 8bd5da325fc90f28464335e4cc4ad1407fe30835
 +F src/vdbetrace.c 36c1ae141327a5352e5656fd448194b6927bc763
- F src/vtab.c d2c54fd22aa83eb34fc6f7cd9b097f2fc2b1e9de
+ F src/vtab.c d8020c0a0e8ccc490ca449d7e665311b6e9f3ba9
 -F src/wal.c 5acb3e7bbd31f10ba39acad9ce6b399055337a9d
 -F src/wal.h 29c197540b19044e6cd73487017e5e47a1d3dac6
 +F src/wal.c 61b556fa9ddf1f6d60244ead41f9a17aeb1e0f12
 +F src/wal.h ce626f1f9000caf09a99a6634a8d794686f92e1b
  F src/walker.c 3d75ba73de15e0f8cd0737643badbeb0e002f07b
- F src/where.c 22783f4275f6fc09b663115a6091837cb5c510e0
+ F src/where.c d836df3a2096c41c39e48ab5636f09f94ba02676
 -F test/8_3_names.test 631ea964a3edb091cf73c3b540f6bcfdb36ce823
 +F test/8_3_names.test 0ed0f6711fefac33829ef9f1d6ca3c56c48ef1c7
  F test/aggerror.test a867e273ef9e3d7919f03ef4f0e8c0d2767944f2
  F test/aggnested.test 0be144b453e0622a085fae8665c32f5676708e00
  F test/alias.test 4529fbc152f190268a15f9384a5651bbbabc9d87
@@@ -369,7 -365,7 +369,7 @@@ F test/cse.test 277350a26264495e86b1785
  F test/ctime.test 7bd009071e242aac4f18521581536b652b789a47
  F test/date.test f3228180c87bbe5d39c9397bf001c0095c3821b9
  F test/dbstatus.test 207e5b63fcb7b9c3bb8e1fdf38ebd4654ad0e54b
- F test/dbstatus2.test 50ce645331b6fca84586bb0f03b274a4b4508ec3
 -F test/dbstatus2.test bf7396af964b89e39435babbcdf296ae8fc5f10a
++F test/dbstatus2.test 3efd4beb77136cd02f826d81d83bc3b94cf9d276
  F test/default.test 6faf23ccb300114924353007795aa9a8ec0aa9dc
  F test/delete.test a065b05d2ebf60fd16639c579a4adfb7c381c701
  F test/delete2.test 3a03f2cca1f9a67ec469915cb8babd6485db43fa
@@@ -399,10 -395,10 +399,10 @@@ F test/enc.test e54531cd6bf941ee6760be0
  F test/enc2.test 796c59832e2b9a52842f382ffda8f3e989db03ad
  F test/enc3.test 90683ad0e6ea587b9d5542ca93568af9a9858c40
  F test/enc4.test c8f1ce3618508fd0909945beb8b8831feef2c020
- F test/eqp.test 6a389bba6ea113fd5179515001be788a38d53ec7
+ F test/eqp.test 46aa946dd55c90635327898275d3e533d23a9845
  F test/errmsg.test 3bb606db9d040cc6854459f8f5e5a2bcd9b7fd2a
  F test/eval.test bc269c365ba877554948441e91ad5373f9f91be3
 -F test/exclusive.test a1b324cb21834a490cd052d409d34789cfef57cb
 +F test/exclusive.test bd8976a6e67daf8e9948eb1c6a27afafe79752fa
  F test/exclusive2.test 372be98f6de44dd78734e364b7b626ea211761a6
  F test/exec.test e949714dc127eaa5ecc7d723efec1ec27118fdd7
  F test/exists.test 8f7b27b61c2fbe5822f0a1f899c715d14e416e30
@@@ -523,9 -520,10 +524,10 @@@ F test/in.test 5941096407d8c133b9eff15b
  F test/in2.test 5d4c61d17493c832f7d2d32bef785119e87bde75
  F test/in3.test 3cbf58c87f4052cee3a58b37b6389777505aa0c0
  F test/in4.test 64f3cc1acde1b9161ccdd8e5bde3daefdb5b2617
- F test/incrblob.test 26fde912a1e0aff158b3a84ef3b265f046aad3be
+ F test/in5.test 99f9a40af01711b06d2d614ecfe96129f334fba3
+ F test/incrblob.test 34765fa6fb5d8e0f256fc7d6497c04b205398849
  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
@@@ -637,19 -634,20 +639,20 @@@ F test/notify3.test a86259abbfb923aa27d
  F test/notnull.test cc7c78340328e6112a13c3e311a9ab3127114347
  F test/null.test a8b09b8ed87852742343b33441a9240022108993
  F test/openv2.test 0d3040974bf402e19b7df4b783e447289d7ab394
+ F test/orderby1.test 31c9865626046666e81cd22ecf8e1c24a4ea41b6
  F test/oserror.test 50417780d0e0d7cd23cf12a8277bb44024765df3
 -F test/pager1.test 2163c6ef119f497a71a84137c957c63763e640ab
 +F test/pager1.test f1f261a4dc5a40b385dfcef946c2e772180d12a9
  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/pcache.test fa8a2b0677225765eced806d9d1676b78a9e2c40
  F test/pcache2.test a83efe2dec0d392f814bfc998def1d1833942025
- F test/permutations.test 1a8ac849b659445a0b3883caf42fa2c2a289f4a1
+ F test/permutations.test 360b92859c0af814b3fe10b68746936389606501
 -F test/pragma.test a62f73293b0f0d79b0c87f8dd32d46fe53b0bd17
 +F test/pragma.test eaf172eb376b20b9d6c639e03903dd43e476f0b8
  F test/pragma2.test 3a55f82b954242c642f8342b17dffc8b47472947
  F test/printf.test ec9870c4dce8686a37818e0bf1aba6e6a1863552
  F test/progress.test 5b075c3c790c7b2a61419bc199db87aaf48b8301
@@@ -724,10 -722,10 +727,10 @@@ F test/speed3.test d32043614c08c53eafdc
  F test/speed4.test abc0ad3399dcf9703abed2fff8705e4f8e416715
  F test/speed4p.explain 6b5f104ebeb34a038b2f714150f51d01143e59aa
  F test/speed4p.test 0e51908951677de5a969b723e03a27a1c45db38b
- F test/spellfix.test 4e339920585e7555660bd3b11cf338af82c656ae
+ F test/spellfix.test 2953e9da0e46dab5f83059ef6bfdebca66e13418
  F test/sqllimits1.test b1aae27cc98eceb845e7f7adf918561256e31298
- F test/stat.test 4ce96d67f6a0bc9647a042c7140cf1c56e049a69
 -F test/stat.test be8d477306006ec696bc86757cfb34bec79447ce
 -F test/stmt.test 25d64e3dbf9a3ce89558667d7f39d966fe2a71b9
++F test/stat.test 6d55845481374066804847cafadb2285839556ff
 +F test/stmt.test 78a6764439cfa5abdcbf98d4d084739e81eeec4f
  F test/subquery.test d4aea23ac267463d4aa604bf937c3992347b20f7
  F test/subquery2.test edcad5c118f0531c2e21bf16a09bbb105252d4cd
  F test/subselect.test d24fd8757daf97dafd2e889c73ea4c4272dcf4e4
@@@ -738,11 -736,11 +741,11 @@@ F test/syscall.test bea9bf329bff733c791
  F test/sysfault.test c79441d88d23696fbec7b147dba98d42a04f523f
  F test/table.test a59d985ca366e39b17b175f387f9d5db5a18d4e2
  F test/tableapi.test 2674633fa95d80da917571ebdd759a14d9819126
- F test/tclsqlite.test 1597d353308531527583481d14d9da52ea8ed0af
+ F test/tclsqlite.test a3d2df21ee98957f5de4f9dc1db0eab68047ab5d
 -F test/tempdb.test 19d0f66e2e3eeffd68661a11c83ba5e6ace9128c
 +F test/tempdb.test 3263e5c3f0604e54d307481e8587327c54544d18
  F test/temptable.test 51edd31c65ed1560dd600b1796e8325df96318e2
  F test/temptrigger.test 26670ed7a39cf2296a7f0a9e0a1d7bdb7abe936d
- F test/tester.tcl 6e5ea4e52c6ba767e90903fcc7c4c57a28c08fd4
 -F test/tester.tcl 2f383e811010b05a83c0f00fc168cae1dd63a6d9
++F test/tester.tcl 5764d5fe85275f9e40272754d6d06f1a43c32a38
  F test/thread001.test 7cc2ce08f9cde95964736d11e91f9ab610f82f91
  F test/thread002.test e630504f8a06c00bf8bbe68528774dd96aeb2e58
  F test/thread003.test ee4c9efc3b86a6a2767516a37bd64251272560a7
@@@ -757,11 -755,11 +760,11 @@@ F test/threadtest3.c 0ed13e09690f6204d7
  F test/tkt-02a8e81d44.test 6c80d9c7514e2a42d4918bf87bf6bc54f379110c
  F test/tkt-26ff0c2d1e.test 888324e751512972c6e0d1a09df740d8f5aaf660
  F test/tkt-2a5629202f.test 1ab32e084e9fc3d36be6dee2617530846a0eb0b6
 -F test/tkt-2d1a5c67d.test b028a811049eb472cb2d3a43fc8ce4f6894eebda
 +F test/tkt-2d1a5c67d.test 0e23cbbbecda6ce453ffb560fdac28489d491d36
  F test/tkt-2ea2425d34.test 1cf13e6f75d149b3209a0cb32927a82d3d79fb28
  F test/tkt-31338dca7e.test 1f714c14b6682c5db715e0bda347926a3456f7a9
 -F test/tkt-313723c356.test c47f8a9330523e6f35698bf4489bcb29609b53ac
 +F test/tkt-313723c356.test 54a1558d2719e171bd88967d66c73be4c617ec55
- F test/tkt-385a5b56b9.test 8eb87c4bbcc3fd4f33d73719de7e9d64973fa196
+ F test/tkt-385a5b56b9.test 7782a382912a51f09f1d1a1442bca1e75f9c549b
  F test/tkt-38cb5df375.test f3cc8671f1eb604d4ae9cf886ed4366bec656678
  F test/tkt-3998683a16.test 6d1d04d551ed1704eb3396ca87bb9ccc8c5c1eb7
  F test/tkt-3a77c9714e.test 32bb28afa8c63fc76e972e996193139b63551ed9
@@@ -933,31 -931,31 +936,31 @@@ F test/vtabF.test fd5ad376f5a34fe0891df
  F test/vtab_alter.test 9e374885248f69e251bdaacf480b04a197f125e5
  F test/vtab_err.test 0d4d8eb4def1d053ac7c5050df3024fd47a3fbd8
  F test/vtab_shared.test 82f463886e18d7f8395a4b6167c91815efe54839
 -F test/wal.test a040047d7f2b9f34bc4d597964e5e7c09609c635
 -F test/wal2.test d4b470f13c87f6d8268b004380afa04c3c67cb90
 -F test/wal3.test b22eb662bcbc148c5f6d956eaf94b047f7afe9c0
 -F test/wal4.test 4744e155cd6299c6bd99d3eab1c82f77db9cdb3c
 -F test/wal5.test f58ed4b8b542f71c7441da12fbd769d99b362437
 -F test/wal6.test 2e3bc767d9c2ce35c47106148d43fcbd072a93b3
 -F test/wal7.test 2ae8f427d240099cc4b2dfef63cff44e2a68a1bd
 -F test/wal8.test b3ee739fe8f7586aaebdc2367f477ebcf3e3b034
 -F test/wal_common.tcl a98f17fba96206122eff624db0ab13ec377be4fe
 -F test/walbak.test b9f68e39646375c2b877be906babcc15d38b4877
 -F test/walbig.test f437473a16cfb314867c6b5d1dbcd519e73e3434
 -F test/walcksum.test f5447800a157c9e2234fbb8e80243f0813941bde
 -F test/walcrash.test 4457436593be8c136f9148487c7dccd5e9013af2
 -F test/walcrash2.test 019d60b89d96c1937adb2b30b850ac7e86e5a142
 -F test/walcrash3.test 595e44c6197f0d0aa509fc135be2fd0209d11a2c
 -F test/walfault.test 97394d8de82a99f7abf1c12ed229640607fd0ad2
 -F test/walhook.test ed00a40ba7255da22d6b66433ab61fab16a63483
 -F test/walmode.test 4022fe03ae6e830583672caa101f046438a0473c
 -F test/walnoshm.test 84ca10c544632a756467336b7c3b864d493ee496
 -F test/walpersist.test 8c6b7e3ec1ba91b5e4dc4e0921d6d3f87cd356a6
 -F test/walro.test a31deb621033442a76c3a61e44929250d06f81b1
 -F test/walshared.test 6dda2293880c300baf5d791c307f653094585761
 -F test/walslow.test e7be6d9888f83aa5d3d3c7c08aa9b5c28b93609a
 -F test/walthread.test de8dbaf6d9e41481c460ba31ca61e163d7348f8e
 +F test/wal.test 5759631b0e610d616c33cc21124b3395f39cd0c7
 +F test/wal2.test b715008438d7332d8c3d9f8dbead2a455d847ba8
 +F test/wal3.test de822707fbc8e9d056edc895adfb8abcccee4590
 +F test/wal4.test 5755887f321baa4c55de0b91066fa7d0cafcac9d
 +F test/wal5.test 187ae92cc9ba1ec6803681b9025cad89af1a8c69
 +F test/wal6.test c561d1e44c89f9cb458a7b03003ed4baac08ba07
 +F test/wal7.test 18cf68ab8010ae0a2baaa48e5b59567a9503e63e
- F test/wal8.test a0b7dee73fc3d3bbf167e04533d37df379a0b7d1
++F test/wal8.test c35dd183708148120928dca908641c361f58062c
 +F test/wal_common.tcl 15f152fd55703975878741beca6cfa4209d5b3b3
 +F test/walbak.test 67339b9e54db0cdaaf21287349bc8056e2919f96
 +F test/walbig.test 3ca3d94751b80054eed5bda20a1339ae1f619483
 +F test/walcksum.test 6510e82303f6fffc2c55bb77a7774cd0eed21a6e
 +F test/walcrash.test a8fa8d8a9a50a49b7abaf8a4a7e2c7ea352c49be
 +F test/walcrash2.test c032d0040374ae28b41f99fc0cc290b4e2e34f17
 +F test/walcrash3.test 97e775404f4c76e5c46f71fbd09691c7e9c25c68
 +F test/walfault.test e5309befcaf4ab08151c35dba20cc5b8a5846748
 +F test/walhook.test 5d2bdb04fd3e220e2f96e6b566d57e00020bdaec
 +F test/walmode.test aa45339b4afa435dde5d88e71a95459cc221a3f4
 +F test/walnoshm.test 559b878f3aab838971d820329ca35f1caa7b038e
 +F test/walpersist.test abd956d66e2f36d2d9d05d3a969f48be6d2ddbec
 +F test/walro.test 3ce5c1d16a3d8c6b2f7504d44d1ebf1098efaa64
 +F test/walshared.test 04590b10c677f75318701818c50bc0dda5da64ab
 +F test/walslow.test 658066419a92d3bd85be71a11ce477af4ffe9153
 +F test/walthread.test c13f5a12fbd9d81e58f49875dc9dd8a52a84cf03
- F test/where.test 4c9f69987ed2aa0173fa930f2b41ab9879478cd8
+ F test/where.test a6bfb5a29286811d798d326a8f1153a58c0fb2bd
  F test/where2.test 43d4becaf5a5df854e6c21d624a1cb84c6904554
  F test/where3.test 667e75642102c97a00bf9b23d3cb267db321d006
  F test/where4.test e9b9e2f2f98f00379e6031db6a6fca29bae782a2
@@@ -1018,7 -1017,7 +1022,7 @@@ F tool/vdbe-compress.tcl f12c884766bd14
  F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
  F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
  F tool/win/sqlite.vsix 67d8a99aceb56384a81b3f30d6c71743146d2cc9
- P 6723add4f492c30b20db8de6ed818c191dedea40 527340abff18aedbcb0f82ac1296a9f548e24ac4
- R 7369178c8728e0979a1ee39f06e2a357
- U dan
- Z 31eeb9d2487a10e71a72223ef69ba91e
 -P 20caf80cb3b65e69a99dbc142db8ee435fb2dbdc 98b633717a1c9a08f6a1d00bc6bc891564ae7e9b
 -R 4c8024fc13aa6a5fc65357b963a76180
++P bc9b9cd0589c4a51ece2e4657d622a04fc203315 1e874629d7cf568368b912b295bd3001147d0b52
++R 729e26131787df9859d2cc515ea0c277
+ U drh
 -Z 885caf237f331087362c9bb98b2de660
++Z 2ac0e014d1bc5c5d9d375cc66ce59204

diff --cc manifest.uuid
index f4cffbfbe8e75f97c9a6857053eb4bf1c13b8f7d,bdeb814a0706ecfa76d47a55935201568706554d..e12e197b31067905c597af052aa621ae6b20544e
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- bc9b9cd0589c4a51ece2e4657d622a04fc203315
 -1e874629d7cf568368b912b295bd3001147d0b52
++6a5c59dd7e0de9b5a2136f1c333afe522f724a71

diff --cc src/func.c
Simple merge

diff --cc src/main.c
Simple merge

diff --cc src/os_win.c
Simple merge

diff --cc src/pager.c
Simple merge

diff --cc src/pragma.c
index 366d5fb81e8f2c289f80ec84979a0593f7edc895,f41f2db06f7376bda69018def772ea07fb3cfedd..a13fdc79442fe3209b83e3475b6dbf50088eec21
--- 1/src/pragma.c
--- 2/src/pragma.c
+++ b/src/pragma.c
@@@ -1558,6 -1537,22 +1559,22 @@@ void sqlite3Pragma
      sqlite3_db_release_memory(db);
    }else
  
 -    returnSingleInt(pParse, "timeout",  db->busyTimeout);
+   /*
+   **   PRAGMA busy_timeout
+   **   PRAGMA busy_timeout = N
+   **
+   ** Call sqlite3_busy_timeout(db, N).  Return the current timeout value
+   ** if one is set.  If no busy handler or a different busy handler is set
+   ** then 0 is returned.  Setting the busy_timeout to 0 or negative
+   ** disables the timeout.
+   */
+   if( sqlite3StrICmp(zLeft, "busy_timeout")==0 ){
+     if( zRight ){
+       sqlite3_busy_timeout(db, sqlite3Atoi(zRight));
+     }
++    returnSingleInt(pParse, "timeout",  &db->busyTimeout);
+   }else
+ 
  #if defined(SQLITE_DEBUG) || defined(SQLITE_TEST)
    /*
    ** Report the current state of file logs for all databases

diff --cc src/prepare.c
Simple merge

diff --cc src/select.c
Simple merge

diff --cc src/sqlite.h.in
index db06322fc03fb97f856cab24957a7b5eab87261d,bf97679ab85ad19ecfe3632a105d8c7c8719d5ea..1b1ba5336721e0d2704222bf344b977736cfb93f
--- 1/src/sqlite.h.in
--- 2/src/sqlite.h.in
+++ b/src/sqlite.h.in
@@@ -4732,11 -4747,9 +4752,14 @@@ void *sqlite3_update_hook
  ** future releases of SQLite.  Applications that care about shared
  ** cache setting should set it explicitly.
  **
 +** ^Note: This method is deprecated on MacOS X 10.7 and iOS version 5.0
 +** and will always return SQLITE_MISUSE, instead of calling this function
 +** shared cache mode should be enabled per-database connection via 
 +** sqlite3_open_v2 with SQLITE_OPEN_SHAREDCACHE instead.
 +**
+ ** This interface is threadsafe on processors where writing a
+ ** 32-bit integer is atomic.
+ **
  ** See Also:  [SQLite Shared-Cache Mode]
  */
  int sqlite3_enable_shared_cache(int);

diff --cc src/sqliteInt.h
Simple merge

diff --cc src/test1.c
Simple merge

diff --cc src/vdbe.c
Simple merge

diff --cc src/vdbeapi.c
Simple merge

diff --cc src/vdbeaux.c
Simple merge

diff --cc test/dbstatus2.test
Simple merge

diff --cc test/stat.test
Simple merge

diff --cc test/tester.tcl
Simple merge

diff --cc test/wal8.test
index eb735fe83d097b4cfcad00a1e5c8ce2b97d7f240,339953895cd5b7b9ecf0524b794a20f94d60047d..fe2e926206119aca81600e4c9e91db1be35bf96f
--- 1/test/wal8.test
--- 2/test/wal8.test
+++ b/test/wal8.test
@@@ -26,8 -26,7 +26,9 @@@
  set testdir [file dirname $argv0]
  source $testdir/tester.tcl
  set ::testprefix wal8
++
  ifcapable !wal {finish_test ; return }
 +if ![wal_is_ok] { finish_test; return }
  
  db close
  forcedelete test.db test.db-wal
@@@ -89,4 -88,4 +90,3 @@@ do_execsql_test 3.1 
  } {t1}
  
  finish_test
--