Merge in changes up to and including the 3.6.23.1 release.

FossilOrigin-Name: 21ca87f69125a9e7124c6ddc566d17f64661b0d3

diff --cc Makefile.in
Simple merge

diff --cc configure
index 5ce6104f00d0430a5547f64a5a70281b252916e6,6b9b772c36db1677d18d64ba8b387c6a66b7c733..6b9b772c36db1677d18d64ba8b387c6a66b7c733
mode 100644,100755..100644
--- 1/configure
--- 2/configure
+++ b/configure

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

diff --cc main.mk
Simple merge

diff --cc manifest
index 6d78a7a479bf60046fbf6d49d4ef356167ab854a,09cbf369f7639f0af363d1985cb12d09d64cfa88..eaa5aa7a3be50304acc13794ed721c44fda8250d
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,11 -1,14 +1,14 @@@
- C fix\smerge\serror\sand\scompiler\swarning
- D 2010-02-26T22:05:01
+ -----BEGIN PGP SIGNED MESSAGE-----
+ Hash: SHA1
+ 
 -C Cherry-pick\sthe\sSQLITE_FCNTL_SIZE_HINT\spatch\s(check-in\s[2b7e3b4a30d6a7c4a8]\nand\sbump\sthe\sversion\snumber\sto\s3.6.23.2.
 -D 2010-05-19T22:09:19
++C Merge\sin\schanges\sup\sto\sand\sincluding\sthe\s3.6.23.1\srelease.
++D 2010-06-16T19:48:57
  F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
- F Makefile.in df768f5addf7b6da984aa279123d2671d716cf5c
 -F Makefile.in 4f2f967b7e58a35bb74fb7ec8ae90e0f4ca7868b
++F Makefile.in b12be4429b75eca982a5646752652efde58e8f29
  F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
- F Makefile.vxworks 10010ddbf52e2503c7c49c7c0b7c7a096f8638a6
+ F Makefile.vxworks ab005d301296c40e021ccd0133ce49ca811e319f
  F README cd04a36fbc7ea56932a4052d7d0b7f09f27c33d6
- F VERSION 2f8d921ecf804e9eb01e836a09512d0318ebd4d3
+ F VERSION e074e6c926531bc0ccf713d48465eb16807d7193
  F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
  F addopcodes.awk 17dc593f791f874d2c23a0f9360850ded0286531
  F art/2005osaward.gif 0d1851b2a7c1c9d0ccce545f3e14bca42d7fd248
@@@ -19,7 -22,7 +22,7 @@@ F art/src_logo.gif 9341ef09f0e53cd44c0c
  F config.guess 226d9a188c6196f3033ffc651cbc9dcee1a42977
  F config.h.in 868fdb48c028421a203470e15c69ada15b9ba673
  F config.sub 9ebe4c3b3dab6431ece34f16828b594fb420da55
- F configure 8bcd25791aa958ecb255385d1c2d91ab1c5acd93
 -F configure 17dee87ba9b797ea22940dc0fb5b08147bfb246a x
++F configure 17dee87ba9b797ea22940dc0fb5b08147bfb246a
  F configure.ac 14740970ddb674d92a9f5da89083dff1179014ff
  F contrib/sqlitecon.tcl 210a913ad63f9f991070821e599d600bd913e0ad
  F doc/lemon.html f0f682f50210928c07e562621c3b7e8ab912a538
@@@ -74,7 -77,7 +77,7 @@@ F ext/icu/README.txt 3b130aa66e7a681136
  F ext/icu/icu.c 850e9a36567bbcce6bd85a4b68243cad8e3c2de2
  F ext/icu/sqliteicu.h 728867a802baa5a96de7495e9689a8e01715ef37
  F ext/rtree/README 6315c0d73ebf0ec40dedb5aa0e942bc8b54e3761
- F ext/rtree/rtree.c 8bb9addfc69886f46f5d873bd76a8ec784d79b31
 -F ext/rtree/rtree.c a354f6be11a91706680936fdf77b4588f0b34dbe
++F ext/rtree/rtree.c dc26ef90f81fe983a72e0ad787da1e7e9d3a6b86
  F ext/rtree/rtree.h 834dbcb82dc85b2481cde6a07cdadfddc99e9b9e
  F ext/rtree/rtree1.test f72885ed80a329d6bd7991043016d74b51edf2c5
  F ext/rtree/rtree2.test 7b665c44d25e51b3098068d983a39902b2e2d7a1
@@@ -87,12 -90,9 +90,12 @@@ F ext/rtree/rtree_perf.tcl 6c18c1f23cd4
  F ext/rtree/rtree_util.tcl 06aab2ed5b826545bf215fff90ecb9255a8647ea
  F ext/rtree/tkt3363.test 2bf324f7908084a5f463de3109db9c6e607feb1b
  F ext/rtree/viewrtree.tcl eea6224b3553599ae665b239bd827e182b466024
 -F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
 +F ext/sqlrr/README.txt 4239030e73023e72a2e727808cd433577d5bf730
 +F ext/sqlrr/sqlrr.c 8d1e6571cd6a6beabdb5bcdfe3a0e723b914db41
 +F ext/sqlrr/sqlrr.h 09e4f8929ad9bc2638732c0cc0db5eef8c417824
 +F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895
  F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8
- F main.mk 545f893ba2ac22811aa566e4dc90735b8d34d987
 -F main.mk a36a05a481afcc00388c4d6d4db0e12cacb546e3
++F main.mk 99e63c772efeb3819b646040bc54712c76d015da
  F mkdll.sh 7d09b23c05d56532e9d44a50868eb4b12ff4f74a
  F mkextu.sh 416f9b7089d80e5590a29692c9d9280a10dbad9f
  F mkextw.sh 4123480947681d9b434a5e7b1ee08135abe409ac
@@@ -106,40 -106,41 +109,41 @@@ F sqlite.pc.in 42b7bf0d02e08b9e77734a47
  F sqlite3.1 6be1ad09113570e1fc8dcaff84c9b0b337db5ffc
  F sqlite3.pc.in ae6f59a76e862f5c561eb32a380228a02afc3cad
  F src/alter.c e6f4d11b1c0b23642fc46bac9abe0753c4294e05
- F src/analyze.c 55155f05ee9ab4ce33b7a4d19c449053f8935200
- F src/attach.c f6d33268019460724e4c57aeec543eaaa55d8310
+ F src/analyze.c 92a65a5a402898a52b03695c7f0cd383724d711f
+ F src/attach.c 7abe1607c2054585377cdba3c219e8572f84ca5e
  F src/auth.c 523da7fb4979469955d822ff9298352d6b31de34
- F src/backup.c 744e98359dfc79fed43e8dec911e33e108b06aae
+ F src/backup.c b293534bc2df23c57668a585b17ee7faaaef0939
  F src/bitvec.c 06ad2c36a9c3819c0b9cbffec7b15f58d5d834e0
  F src/btmutex.c 96a12f50f7a17475155971a241d85ec5171573ff
- F src/btree.c c9ee3c30fbf21ebb4f45c244bd47d7999e6f2704
+ F src/btree.c 0d6e44d664b1775b269ea7e6f66fdffcfc32ceb3
  F src/btree.h 0e193b7e90f1d78b79c79474040e3d66a553a4fa
  F src/btreeInt.h 71ed5e7f009caf17b7dc304350b3cb64b5970135
- F src/build.c 81412e0f3cabd0cc7a71a1644c46d9ccad9613f5
+ F src/build.c 11100b66fb97638d2d874c1d34d8db90650bb1d7
  F src/callback.c 908f3e0172c3d4058f4ca0acd42c637c52e9669f
- F src/complete.c 4c8a742c4a4a6d9c835912648f5c8f032ea36c7b
+ F src/complete.c dc1d136c0feee03c2f7550bafc0d29075e36deac
+ F src/ctime.c ceb247eb31620bba66a94c3f697db489a1652353
  F src/date.c 485a4409a384310e6d93fd1104a9d0a8658becd9
  F src/delete.c 610dc008e88a9599f905f5cbe9577ac9c36e0581
- F src/expr.c d0a345e1d8995e142bc5d9f39a97b9981d7d8f23
+ F src/expr.c 6baed2a0448d494233d9c0a610eea018ab386a32
  F src/fault.c 160a0c015b6c2629d3899ed2daf63d75754a32bb
  F src/fkey.c e2116672a6bd610dc888e27df292ebc7999c9bb0
- F src/func.c 3cd22e930f7c5bbea8ce5a62ed263abbc6eb679b
- F src/global.c 75946a4a2ab41c6ae58f10ca0ed31b3449694b26
 -F src/func.c 5dca069d98eca0ff70c9a8fb8ab9e1d6467187b5
++F src/func.c cc68e721c25b9ad0d5c2d9e173298cfc1818fe4c
+ F src/global.c 5a9c1e3c93213ca574786ac1caa976ce8f709105
  F src/hash.c 458488dcc159c301b8e7686280ab209f1fb915af
  F src/hash.h 2894c932d84d9f892d4b4023a75e501f83050970
  F src/hwtime.h d32741c8f4df852c7d959236615444e2b1063b08
- F src/insert.c 11eeb4f2e5d57b7c106f0c28eea8d0dd896dfd70
+ F src/insert.c 76d6b44a9f9050134fd81205f4b792cbdac7c925
  F src/journal.c b0ea6b70b532961118ab70301c00a33089f9315c
- F src/legacy.c b319b5291ca8ab015d132db389a4d6dac5efb97f
 -F src/legacy.c a199d7683d60cef73089e892409113e69c23a99f
++F src/legacy.c 015826a958f690302d27e096a68d50b3657e4201
  F src/lempar.c 7f026423f4d71d989e719a743f98a1cbd4e6d99e
  F src/loadext.c 1c7a61ce1281041f437333f366a96aa0d29bb581
- F src/main.c 90176cc9163ed825e86ff021210f0ecc37aeed89
 -F src/main.c 7d89bb6dcc6993a8d32f4f22dae3e57c50a41399
++F src/main.c 5c1eeef69c0b6cb4cc72fa55e8d47914f7b49937
  F src/malloc.c 5fa175797f982b178eaf38afba9c588a866be729
  F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
- F src/mem1.c f38d5dcc701364905c8c513c89eb3b819c4e8f4b
- F src/mem2.c 92b4f772b1ee7469e256f1c2eff0b51a0ba19460
 -F src/mem1.c 89d4ea8d5cdd55635cbaa48ad53132af6294cbb2
++F src/mem1.c 0f36f1eecd786240924a56f8796ffa850d47a96f
+ F src/mem2.c ee752297650632935218dcf3b20c5ed5899cb4b5
  F src/mem3.c 9b237d911ba9904142a804be727cc6664873f8a3
- F src/mem5.c 4837b795ebdecc0cfe1522cd0c8b2c5d84ea490d
+ F src/mem5.c eb7a5cb98915dd7a086fa415ce3a5a0f20d0acff
  F src/memjournal.c 5bfc2f33c914946e2f77ed3f882aff14dfc9355d
  F src/mutex.c 581a272e09098040ca3ef543cb5f3d643eff7d50
  F src/mutex.h 6fde601e55fa6c3fae768783c439797ab84c87c6
@@@ -152,30 -153,30 +156,30 @@@ F src/os.c 8bc63cf91e9802e2b807198e54e5
  F src/os.h 534b082c3cb349ad05fa6fa0b06087e022af282c
  F src/os_common.h 240c88b163b02c21a9f21f87d49678a0aa21ff30
  F src/os_os2.c 75a8c7b9a00a2cf1a65f9fa4afbc27d46634bb2f
- F src/os_unix.c 0af0a55e2dd55bc4f4c3ccf04cc8f1f4a2e2e65f
- F src/os_win.c 5ffab20249a61e0625f869efe157fa009747039b
- F src/pager.c 5dee83c3cf4e94b72fcd81dca67abd7617227217
+ F src/os_unix.c fdeb37c703243141470396acf32331674b905e55
+ F src/os_win.c bc65553f911439a6b1aa3cf22f34e5ea1c4aa394
+ F src/pager.c e39ac887694a6644135f5e4151fe293b5397dd64
  F src/pager.h 1b32faf2e578ac3e7bcf9c9d11217128261c5c54
  F src/parse.y ace5c7a125d9f2a410e431ee3209034105045f7e
- F src/pcache.c 815bcb3cf0e14b23212efd3f4981f667a5fd633e
+ F src/pcache.c 4956b41d6ba913f7a8a56fbf32be78caed0e45c2
  F src/pcache.h c683390d50f856d4cd8e24342ae62027d1bb6050
  F src/pcache1.c 2bb2261190b42a348038f5b1c285c8cef415fcc8
- F src/pragma.c 4cf0b84933aad381a3031b1416b8c8d9491e5ccd
- F src/prepare.c ca47539f6a7608639359be382d9df7eb45d2ad87
- F src/printf.c 2c2702dc4955394dae554b7c45f45656eb42de7f
 -F src/pragma.c 56d95f76154a5f873c32eae485bb625f3c70be46
 -F src/prepare.c 18292e5f365655cd5c5693e09508e90668f7d547
++F src/pragma.c cd1f5140914531a87222466565ff3a30db919ffd
++F src/prepare.c 1b3d55ed0fd5b530c9681ac306f06dd646f7e8df
+ F src/printf.c 5f5b65a83e63f2096a541a340722a509fa0240a7
  F src/random.c cd4a67b3953b88019f8cd4ccd81394a8ddfaba50
- F src/resolve.c 56ecd50851afa9dbcc1803ef86a9b17b3f3d3b89
+ F src/resolve.c a1648d98e869937b29f4f697461fe4d60f220a7b
  F src/rowset.c 69afa95a97c524ba6faf3805e717b5b7ae85a697
- F src/select.c 0109b993c360d649857523abb72919e1794f9b45
- F src/shell.c 56521a172567f5f9f59f528599bf63380e150ac4
- F src/sqlite.h.in 2afdca943d145f84f55468b1ab608df0d719c318
+ F src/select.c 4113ef360430ed4e7533690ef46d06c20204adce
+ F src/shell.c c40427c7245535a04a9cb4a417b6cc05c022e6a4
+ F src/sqlite.h.in f9a9be1bce911669a259f7c747bf05635cb360b5
  F src/sqlite3ext.h 69dfb8116af51b84a029cddb3b35062354270c89
- F src/sqliteInt.h a1df33a2c9a0c5062088b655ddf10237f1bcef2f
+ F src/sqliteInt.h 6873f7f4c24fcdceece8777f2a1cbec049df77a0
  F src/sqliteLimit.h 3afab2291762b5d09ae20c18feb8e9fa935a60a6
- F src/status.c e651be6b30d397d86384c6867bc016e4913bcac7
+ F src/status.c d329385a2cba3ea49d9d68af0ad84b22d46b4f40
  F src/table.c 2cd62736f845d82200acfa1287e33feb3c15d62e
  F src/tclsqlite.c bad6570a005b234ea670b9f7b48256da19a032d3
- F src/test1.c db87de2bf5d804cdf408eb7b1773793ef8c42e22
 -F src/test1.c aa9b1e10e834330e7759afb639420117e2422ded
++F src/test1.c 73a2b1d2188e9640d1915c1d8acc5679df7851dd
  F src/test2.c b6b43413d495addd039a88b87d65c839f86b18cb
  F src/test3.c 4c21700c73a890a47fc685c1097bfb661346ac94
  F src/test4.c ad03bb987ddedce928f4258c1e7fa4109a73497d
@@@ -186,9 -187,9 +190,9 @@@ F src/test8.c f959db9a22d882013b64c9275
  F src/test9.c bea1e8cf52aa93695487badedd6e1886c321ea60
  F src/test_async.c c1656facbaf43cb2e71b62621e5b9eb080e2621c
  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 220a67047af393756f55760fdf442d935d0d88f3
+ F src/test_config.c 5844274bf6cec4af3e6461fb3e2d349082635e81
  F src/test_devsym.c de3c9af2bb9a8b1e44525c449e4ec3f88e3d4110
  F src/test_func.c 13b582345fb1185a93e46c53310fae8547dcce20
  F src/test_hexio.c 1237f000ec7a491009b1233f5c626ea71bce1ea2
@@@ -207,23 -208,23 +211,23 @@@ F src/test_server.c bbba05c144b5fc4b52f
  F src/test_tclvar.c f4dc67d5f780707210d6bb0eb6016a431c04c7fa
  F src/test_thread.c 00fed80690ae7f1525483a35861511c48bc579f2
  F src/test_wsd.c 41cadfd9d97fe8e3e4e44f61a4a8ccd6f7ca8fe9
- F src/tokenize.c e7f3606cc1b51a819a2bfee99100648d35bc791d
+ F src/tokenize.c 25ceb0f0a746ea1d0f9553787f3f0a56853cfaeb
  F src/trigger.c 340c9eca0fb24b1197468d96ba059f867c9834c7
  F src/update.c c0dc6b75ad28b76b619042d934f337b02acee208
- F src/utf.c dad16adcc0c35ef2437dca125a4b07419d361052
- F src/util.c aa0b1da8f71edff84b4b41dbe05fe6ac75d819c6
- F src/vacuum.c 28ee5a4963d16cf2477075d85966c0f461cd79de
- F src/vdbe.c 428411c6fbd49e9a4ce043dad87a0b079d403714
- F src/vdbe.h bea1f0cd530775bdb58a340265f3cf3ee920e9b2
- F src/vdbeInt.h e276691b6835da5c0008cc5beaaecedcd7bdba8e
- F src/vdbeapi.c 24fa8ef6d23ea215fd24417c744ffdb1ddb9aa88
- F src/vdbeaux.c 8f30e619a8077ee516fa1494fa603550fa951726
- F src/vdbeblob.c 84f924700a7a889152aeebef77ca5f4e3875ffb4
- F src/vdbemem.c aeba77b59f3553d3cc5b72c18a8267c6fba546b9
+ F src/utf.c 1baeeac91707a4df97ccc6141ec0f808278af685
+ F src/util.c 32aebf04c10e51ad3977a928b7416bed671b620b
+ F src/vacuum.c b1d542c8919d4d11119f78069e1906a1ad07e0ee
+ F src/vdbe.c 8acca6dab2505e9650f6f014ada6ef30570cba99
+ F src/vdbe.h 471f6a3dcec4817ca33596fe7f6654d56c0e75f3
+ F src/vdbeInt.h ae1e6ba0dd3fb4a886898d2829d748be701b01f8
 -F src/vdbeapi.c 74c25680046a116b24b95393914d3669c23305dc
++F src/vdbeapi.c 6248612d1b1f6910bf535505bef4bd45ee2d6f1a
+ F src/vdbeaux.c 0f352f63be78138bd94275aa3c8361e760ecc639
+ F src/vdbeblob.c 5327132a42a91e8b7acfb60b9d2c3b1c5c863e0e
+ F src/vdbemem.c 2a82f455f6ca6f78b59fb312f96054c04ae0ead1
  F src/vdbetrace.c 864cef96919323482ebd9986f2132435115e9cc2
- F src/vtab.c 7c7713d66cda699f16bf1cc601d8d4f5070ab935
+ F src/vtab.c 606adf51cd6d4ba51a8c6dccede06a6f7b0dd72d
  F src/walker.c 3112bb3afe1d85dc52317cb1d752055e9a781f8f
- F src/where.c 1041ef1174ad36679d078188510f56f2801737a5
+ F src/where.c 399ea4c090284c9d16f76d685b9b44e8b9b4442b
  F test/aggerror.test a867e273ef9e3d7919f03ef4f0e8c0d2767944f2
  F test/alias.test 4529fbc152f190268a15f9384a5651bbbabc9d87
  F test/all.test 14165b3e32715b700b5f0cbf8f6e3833dda0be45
@@@ -240,10 -241,10 +244,10 @@@ F test/async2.test bf5e2ca2c96763b4cba3
  F test/async3.test 93edaa9122f498e56ea98c36c72abc407f4fb11e
  F test/async4.test aafa6328c559d3e4bb587de770cbdecfca06f0da
  F test/async5.test f3592d79c84d6e83a5f50d3fd500445f7d97dfdf
 -F test/attach.test ce9660e51768fab93cf129787be886c5d6c4fd81
 +F test/attach.test ccdedd5496a0244f8e45366ba9253af30083ea84
  F test/attach2.test a295d2d7061adcee5884ef4a93c7c96a82765437
  F test/attach3.test bd9830bc3a0d22ed1310c9bff6896927937017dc
- F test/attachmalloc.test cf8cf17d183de357b1147a9baacbdfc85b940b61
+ F test/attachmalloc.test 38d2da5fdaf09ba0add57296967a3061e5842584
  F test/auth.test 8f21c160a4562f54f27618e85bac869efcecbcaf
  F test/auth2.test 270baddc8b9c273682760cffba6739d907bd2882
  F test/auth3.test a4755e6a2a2fea547ffe63c874eb569e60a28eb5
@@@ -527,8 -529,8 +533,8 @@@ F test/pageropt.test 3ee6578891baaca967
  F test/pagesize.test 76aa9f23ecb0741a4ed9d2e16c5fa82671f28efb
  F test/pcache.test eebc4420b37cb07733ae9b6e99c9da7c40dd6d58
  F test/pcache2.test 0d85f2ab6963aee28c671d4c71bec038c00a1d16
- F test/permutations.test 1ce2874df8fec876d0b963c7a3ef61c4e9df8827
+ F test/permutations.test 91928573ca2db2c88dbc50ab34e4a585d912b580
 -F test/pragma.test 5aeb48a442dba3c3e8e38773b121371814ab3b17
 +F test/pragma.test 648a1760925d7d39003b3fd29e1b050c983e7553
  F test/pragma2.test 5364893491b9231dd170e3459bfc2e2342658b47
  F test/printf.test 05970cde31b1a9f54bd75af60597be75a5c54fea
  F test/progress.test 5b075c3c790c7b2a61419bc199db87aaf48b8301
@@@ -772,7 -775,7 +779,7 @@@ F tool/lempar.c 01ca97f87610d1dac6d8cd9
  F tool/mkkeywordhash.c d2e6b4a5965e23afb80fbe74bb54648cd371f309
  F tool/mkopts.tcl 66ac10d240cc6e86abd37dc908d50382f84ff46e
  F tool/mkspeedsql.tcl a1a334d288f7adfe6e996f2e712becf076745c97
- F tool/mksqlite3c.tcl 4478ffa3ed3fee37f753dae92af4054d9425c80f
 -F tool/mksqlite3c.tcl 4c6924c7e877defa8f9a12ef1e6867de614acf3f
++F tool/mksqlite3c.tcl a30073f702570f963574a14c692a94c26c858ba8
  F tool/mksqlite3h.tcl eb100dce83f24b501b325b340f8b5eb8e5106b3b
  F tool/mksqlite3internalh.tcl 7b43894e21bcb1bb39e11547ce7e38a063357e87
  F tool/omittest.tcl 27d6f6e3b1e95aeb26a1c140e6eb57771c6d794a
@@@ -792,9 -795,14 +799,14 @@@ F tool/speedtest2.tcl ee2149167303ba8e9
  F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
  F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
  F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
- P 62dfb44b3b66c4acb1a7a10c44cbee1022a88883
- R 3cecb802e0818a552699f238e5d8e344
- T *branch * apple-osx
- T *sym-apple-osx *
- U adam
- Z 1ccb326a490da92940855d68c89ac99f
 -P a40d080ca3c5f152f3296caf48f20728f61317de
 -R 6b321985aaecd4ff831144c4a95fd584
++P 5c0afe70a5ee2b378896bf30426823dc5ae4e95c 776679af588625f13307369770979bccae7cf03a
++R 90e27fcea4f7f54474c3a0fb8671dd73
+ U drh
 -Z c0f8d3e720ac9f1021b4b9695ecbd8fd
++Z b8746f44feb03a04fe1e2272410b2363
+ -----BEGIN PGP SIGNATURE-----
+ Version: GnuPG v1.4.6 (GNU/Linux)
+ 
 -iD8DBQFL9GGSoxKgR168RlERAnsLAJ9mAxq1HjJvHt5vClDz1V5oM9GOTwCgiKms
 -ckp+G3lPReQ5n8ebpgNyR7c=
 -=B53W
++iD8DBQFMGSqsoxKgR168RlERAtaeAJwOjCShd/QM6A+bZt7Sd1NRZQnhYgCdEZRm
++OPl6AbsNdGPQiQAPLtVWZiQ=
++=hX2q
+ -----END PGP SIGNATURE-----

diff --cc manifest.uuid
index b1c68774f37f849d07032373fdf649f8fafb790f,f2572112b7deff507d123cfe2fbe0cedfe17aa70..c09111da5920b69831e0dd16919023a53d973273
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 5c0afe70a5ee2b378896bf30426823dc5ae4e95c
 -776679af588625f13307369770979bccae7cf03a
++21ca87f69125a9e7124c6ddc566d17f64661b0d3

diff --cc src/func.c
Simple merge

diff --cc src/legacy.c
index 4f66576d2c05583c8cd2c3ff4f7a1ee00a96cb53,ebab2de37d996e1bb4a4d9a84caec76a5eff99ea..3cf025c73ff957cd1d165009c99811db0d9e7c7f
--- 1/src/legacy.c
--- 2/src/legacy.c
+++ b/src/legacy.c
@@@ -44,11 -41,9 +44,11 @@@ int sqlite3_exec
    int nRetry = 0;             /* Number of retry attempts */
    int callbackIsInit;         /* True if callback data is initialized */
  
-   if( !sqlite3SafetyCheckOk(db) ) return SQLITE_MISUSE;
+   if( !sqlite3SafetyCheckOk(db) ) return SQLITE_MISUSE_BKPT;
    if( zSql==0 ) zSql = "";
 -
 +#ifdef SQLITE_ENABLE_SQLRR
 +  SRRecExec(db, zSql);
 +#endif  
    sqlite3_mutex_enter(db->mutex);
    sqlite3Error(db, SQLITE_OK, 0);
    while( (rc==SQLITE_OK || (rc==SQLITE_SCHEMA && (++nRetry)<2)) && zSql[0] ){

diff --cc src/main.c
Simple merge

diff --cc src/mem1.c
index 01f7a0f4db37b0b0803e385ba8223a51a80d4446,1a0183999278bdee66f4bc37f7293cb2bd071dcd..29452d0485fe86aff791d99232f61fdbc4810fa3
--- 1/src/mem1.c
--- 2/src/mem1.c
+++ b/src/mem1.c
@@@ -80,9 -61,21 +83,21 @@@ static void sqlite3MemFree(void *pPrior
    sqlite3_int64 *p = (sqlite3_int64*)pPrior;
    assert( pPrior!=0 );
    p--;
 -  free(p);
 +  SQLITE_FREE(p);
  }
  
+ /*
+ ** Report the allocated size of a prior return from xMalloc()
+ ** or xRealloc().
+ */
+ static int sqlite3MemSize(void *pPrior){
+   sqlite3_int64 *p;
+   if( pPrior==0 ) return 0;
+   p = (sqlite3_int64*)pPrior;
+   p--;
+   return (int)p[0];
+ }
+ 
  /*
  ** Like realloc().  Resize an allocation previously obtained from
  ** sqlite3MemMalloc().

diff --cc src/pragma.c
Simple merge

diff --cc src/prepare.c
Simple merge

diff --cc src/test1.c
Simple merge

diff --cc src/vdbeapi.c
Simple merge

diff --cc tool/mksqlite3c.tcl
Simple merge