Merge all recent enhancements from trunk, and in particular the

SQLITE_DBCONFIG_ENABLE_FTS3_TOKENIZER change.

FossilOrigin-Name: 4fb4aee83da5cd1d75627f96ab431132628aeef4

diff --cc manifest
index 4bd7a5b4ad60cdacfb86a8354b7810c4d3c8ea9e,046a24e640e19c9a4e59ff67c58034e09eee67cb..3ff715555c9012d7a00a9c083a33c2e175c76d98
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,6 -1,6 +1,6 @@@
- C Merge\sthe\smaster-journal\soptimization\sand\sother\srecent\schanges\sfrom\strunk.
- D 2016-02-22T16:32:39.845
 -C Fix\sthe\sICU\sextension\sLIKE\sfunction\sso\sthat\sit\sdoes\snot\sread\spast\sthe\send\sof\sa\sbuffer\sif\sit\sit\spassed\smalformed\sutf-8.
 -D 2016-02-26T16:03:29.500
 -F Makefile.in 4e90dc1521879022aa9479268a4cd141d1771142
++C Merge\sall\srecent\senhancements\sfrom\strunk,\sand\sin\sparticular\sthe\nSQLITE_DBCONFIG_ENABLE_FTS3_TOKENIZER\schange.
++D 2016-02-26T16:14:59.261
 +F Makefile.in 6bc82e8fca16b46e6158b5614f16b68cc42cbe5d
  F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
  F Makefile.msc 28fc4ee02333996d31b3602b39eeb8e609a89ce4
  F README.md 8ecc12493ff9f820cdea6520a9016001cb2e59b7
@@@ -295,11 -292,11 +295,11 @@@ F src/auth.c b56c78ebe40a2110fd361379f7
  F src/backup.c f60f0aa55d25d853ffde53d0b0370a7bb7ee41ce
  F src/bitvec.c 3ee4c8b2c94ed3a7377256e18199e6ff5cf33f63
  F src/btmutex.c bc87dd3b062cc26edfe79918de2200ccb8d41e73
- F src/btree.c 733117e4ef7be83d54c088e9c837cc6817f2f2fe
- F src/btree.h 368ceeb4bd9312dc8df2ffd64b4b7dbcf4db5f8e
 -F src/btree.c 7bb920c473c277380fcb3e8a8ee28ce1a48e0abc
++F src/btree.c 975209703bd78b927cd4a0cb59ee0be5d48437b5
+ F src/btree.h a5008b9afe56e8e54ade6c436a910f112defcca9
  F src/btreeInt.h c18b7d2a3494695133e4e60ee36061d37f45d9a5
- F src/build.c 88f185a37d1e087818fd7077d84d65c5babefdb1
- F src/callback.c 0643b8fb06c95a8977beb201b268210d4b131a22
+ F src/build.c 6661513c8f90a23d44ed5e5ada7ea40fac6b6b77
+ F src/callback.c 2e76147783386374bf01b227f752c81ec872d730
  F src/complete.c a3634ab1e687055cd002e11b8f43eb75c17da23e
  F src/ctime.c 60e135af364d777a9ab41c97e5e89cd224da6198
  F src/date.c 0b73e681c11fca867fec554750c07fe0d4e417c1
@@@ -315,9 -312,9 +315,9 @@@ F src/hash.h c8f3c31722cf3277d037139097
  F src/hwtime.h d32741c8f4df852c7d959236615444e2b1063b08
  F src/insert.c 9ca97272e9f74ed0efddf3b4350ee12740cebbef
  F src/journal.c fe3a3e2559ce3ce9d371afd30fbabbc074174575
 -F src/legacy.c 75d3023be8f0d2b99d60f905090341a03358c58e
 +F src/legacy.c b419b813f192eef79d73f968511d2ee129525e21
  F src/loadext.c 9e2a41adcaff16ebc1ebff1f336cbf33de55396f
- F src/main.c be25ea1336aa4e9a24deb74aea6e08399815ffd8
 -F src/main.c be9309f442ec291177642d2e48e82290e0951f4b
++F src/main.c 7b310607d36a7c9754671284f646e0ea5196d299
  F src/malloc.c 1443d1ad95d67c21d77af7ae3f44678252f0efec
  F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
  F src/mem1.c 6919bcf12f221868ea066eec27e579fed95ce98b
@@@ -336,34 -333,33 +336,34 @@@ F src/os.c be9908f7b1f7f7a5e110f9c5cb08
  F src/os.h 3e57a24e2794a94d3cf2342c6d9a884888cd96bf
  F src/os_common.h b2f4707a603e36811d9b1a13278bffd757857b85
  F src/os_setup.h c9d4553b5aaa6f73391448b265b89bed0b890faa
 -F src/os_unix.c 3a6f20736dfb8a0949cdd66553fdf59f6604be35
 -F src/os_win.c f0d7aa603eb6262143d7169a222aea07c4fca91d
 +F src/os_unix.c df8e43477f40ddcf707a9f3fabf7a970b7a5c157
 +F src/os_win.c 390534cac9a3730d589241d4c452901bd2aaf7bd
  F src/os_win.h eb7a47aa17b26b77eb97e4823f20a00b8bda12ca
- F src/pager.c 54b0543664087c338856cf5064549b107d12e3b6
- F src/pager.h 3de08f90567892585cce2e1db07686ff1422c4fb
 -F src/pager.c d034c69b958c01289eb8070cbf902e1a68cd7e0b
 -F src/pager.h e1d38a2f14849e219df0f91f8323504d134c8a56
++F src/pager.c 14a1213df1e8483c0c84d0014be40fb69b206165
++F src/pager.h ff4c0c4bdf5e0e1d6a6c004313e240822ceee4a1
  F src/parse.y c3ce2c4a7cbf0b699239be6b2a945c5cb51875e2
  F src/pcache.c 647bb53a86b7bbcf55ad88089b3ea5a9170b90df
  F src/pcache.h 4d0ccaad264d360981ec5e6a2b596d6e85242545
  F src/pcache1.c 72f644dc9e1468c72922eff5904048427b817051
- F src/pragma.c eb149efaf7459d4e83e013cf603c12eec6b9b753
 -F src/pragma.c d6028d23a9495a8b55f2075e3244ec9a0485e03e
++F src/pragma.c fc4b8918ea5a5dd0bd9f6f8b2dacaba1d6d59875
  F src/pragma.h 64c78a648751b9f4f297276c4eb7507b14b4628c
 -F src/prepare.c 22df6171aec1d86904ed2ad30c2348a5748aa04e
 +F src/prepare.c 9c56ea254317e27d3a1273fa812b8578b5e2f850
  F src/printf.c 63e6fb12bbe702dd664dc3703776c090383a5a26
  F src/random.c ba2679f80ec82c4190062d756f22d0c358180696
  F src/resolve.c b8f7174e5f8c33c44ded3a25a973d0bb89228c20
  F src/rowset.c 9fe4b3ad7cc00944386bb600233d8f523de07a6e
- F src/select.c 1a7e23a3bb2edb9cdc46ab0cf7c1500109cf2531
- F src/shell.c 0367440658104bf2ce8d8a9a5a713a4b11c9acbe
- F src/sqlite.h.in 3932a4505c6b7594f53247c3e14222701b0e0e70
+ F src/select.c 1bacfde7b7cec134d2b354cbcf67bafc67078431
+ F src/shell.c 89b73e894e737cc2f21e4bce0feb3ea21cc61124
 -F src/sqlite.h.in 6bf029bcb077c6db633a77b7fda5ffd5b7c950b7
++F src/sqlite.h.in b02a27147028a00475a9db30565b9e7881df660a
  F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
 +F src/sqlite3_private.h a81a9c5f97c095cc3e86914a05f8fabe0011f4a1
  F src/sqlite3ext.h dfbe62ffd95b99afe2140d8c35b180d11924072d
- F src/sqliteInt.h 15f5a21b312cabf6fcef5f76022465d1eb51c1bb
 -F src/sqliteInt.h 63c0e1b5b5d608a1ba2303fe3a554b859a120406
++F src/sqliteInt.h a8c20484ff153c96e57491c190b5ae337e6abd94
  F src/sqliteLimit.h 216557999cb45f2e3578ed53ebefe228d779cb46
  F src/status.c 70912d7be68e9e2dbc4010c93d344af61d4c59ba
  F src/table.c 5226df15ab9179b9ed558d89575ea0ce37b03fc9
  F src/tclsqlite.c 13debcc6a5ca1217486f8903768c01114fbe8b58
- F src/test1.c 46a689306f959e32164d9043f79e5db8495336f6
 -F src/test1.c f14a6f9e2cff6cba4d83e2b0c52857f61886cead
++F src/test1.c c506aae8a90fadbf4dfda1a9f7acec77356879b9
  F src/test2.c 5586f43fcd9a1be0830793cf9d354082c261b25b
  F src/test3.c a8887dabbbee3059af338f20d290084a63ed1b0f
  F src/test4.c d168f83cc78d02e8d35567bb5630e40dcd85ac1e
@@@ -377,7 -373,7 +377,7 @@@ F src/test_autoext.c dea8a01a7153b9adc9
  F src/test_backup.c 2e6e6a081870150f20c526a2e9d0d29cda47d803
  F src/test_blob.c b2551a9b5573232db5f66f292307c37067937239
  F src/test_btree.c 2e9978eca99a9a4bfa8cae949efb00886860a64f
- F src/test_config.c 9f96e204b38ef8b1fbbe29565f731f4bf1811152
 -F src/test_config.c 0dee90328e3dedf8ba002ee94b6a7e7ea7726fe4
++F src/test_config.c f569bb9c62cb98ffc7968d7f557703197fb4027e
  F src/test_demovfs.c 0de72c2c89551629f58486fde5734b7d90758852
  F src/test_devsym.c e7498904e72ba7491d142d5c83b476c4e76993bc
  F src/test_fs.c f10f840ca4f8c72e4837908bd8347ac4bcab074b
@@@ -416,27 -412,27 +416,27 @@@ F src/treeview.c c525282442111b3f61eb17
  F src/trigger.c e14840ee0c3e549e758ec9bf3e4146e166002280
  F src/update.c a7eeeaffad59c6506f01303a071dac11de8269ca
  F src/utf.c 699001c79f28e48e9bcdf8a463da029ea660540c
- F src/util.c 38c06684c922694809ccb988a13562c16890a3d5
+ F src/util.c 6ed9d7bdd3b0a30742027b6d8e8e1a9e2b14f373
  F src/vacuum.c feb1eabb20987983d9350cad98299b21fa811f52
 -F src/vdbe.c 87ae3a5657fefed7875f3eb30e7ababd48013d71
 +F src/vdbe.c 5c09ebeb5d59ca587e0c1d23cdbcddd99864bfe5
  F src/vdbe.h c743791f723049db94f009e3e30958952bc2d512
- F src/vdbeInt.h 84827a809229917fdd3cc05af719dbb61314a5a3
+ F src/vdbeInt.h 49a74fe5ece206d2d8666ba9afaf1abeda5f123b
 -F src/vdbeapi.c 95b1f8e527240a18a9aea41a655b013bf07a7009
 +F src/vdbeapi.c 334db1c072f54fa5bb85bf552046d4397c5534f6
- F src/vdbeaux.c 9583c5c05a75feb699591c9f24e4750def6537fb
+ F src/vdbeaux.c 2c15cf88de4df97428318c8cfac0dea873dae451
  F src/vdbeblob.c 3b570b730109e8f653d9d2081649f6e7015113db
  F src/vdbemem.c be8381ed6de54eb9cb9dfa802823cdeb5166d855
  F src/vdbesort.c 307460bfa4de4d1c3901fcd42089159131e34062
  F src/vdbetrace.c f75c5455d8cf389ef86a8bfdfd3177e0e3692484
- F src/vtab.c c27c0232bbc6bd4b50320ea0ef988334cde7d1ca
+ F src/vtab.c 943c23b355f0a8f859f9583e7315d64bebdb0899
  F src/vxworks.h d2988f4e5a61a4dfe82c6524dd3d6e4f2ce3cdb9
 -F src/wal.c 10deb6b43887662691e5f53d10b3c171c401169b
 -F src/wal.h 2f7c831cf3b071fa548bf2d5cac640846a7ff19c
 +F src/wal.c 0eaa33b32c3aa8e8d956cdd4693c4d8604966633
 +F src/wal.h 29c2a284ddd9c665199273dadc7255a227092291
  F src/walker.c 0f142b5bd3ed2041fc52d773880748b212e63354
- F src/where.c 5b67fb8035ae4697cf721db095f800ef8dff5f56
- F src/whereInt.h 78b6b4de94db84aecbdc07fe3e38f648eb391e9a
- F src/wherecode.c 791a784bbf8749d560fdb0b990b607bc4f44a38d
+ F src/where.c 32051597188dc632bafb32d50a9c3a04fb97ce39
+ F src/whereInt.h 93297d56edd137b7ea004490690fb6e2ce028a34
+ F src/wherecode.c 39c1ef4598bedf1d66249334c74efd23ddd182ac
  F src/whereexpr.c fb87944b1254234e5bba671aaf6dee476241506a
 -F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2
 +F test/8_3_names.test 05034aadccd2253ffe6cbefb06662b8aa4600f77
  F test/affinity2.test a6d901b436328bd67a79b41bb0ac2663918fe3bd
  F test/aggerror.test a867e273ef9e3d7919f03ef4f0e8c0d2767944f2
  F test/aggnested.test b35b4cd69fc913f90d39a575e171e1116c3a4bb7
@@@ -1303,36 -1298,36 +1303,36 @@@ F test/vtabI.test 751b07636700dbdea328e
  F test/vtab_alter.test 9e374885248f69e251bdaacf480b04a197f125e5
  F test/vtab_err.test 0d4d8eb4def1d053ac7c5050df3024fd47a3fbd8
  F test/vtab_shared.test 5253bff2355a9a3f014c15337da7e177ab0ef8ad
 -F test/wal.test 0148c8b3421a25fdb4d9c160e84a681d0646371b
 -F test/wal2.test 1f841d2048080d32f552942e333fd99ce541dada
 -F test/wal3.test 5dd734147f1f8f958c5261a1f2775d346d7013ce
 -F test/wal4.test 4744e155cd6299c6bd99d3eab1c82f77db9cdb3c
 -F test/wal5.test 88b5d9a6a3d1532497ee9f4296f010d66f07e33c
 -F test/wal6.test a9d6aa635b9d63607dabdc11406f5f96ca986635
 +F test/wal.test 21c1bc3ca769350746cbaf0ba02119bc61e9c4ec
 +F test/wal2.test 703b87c21c1e3e169d607158de414c7c2655b93e
 +F test/wal3.test 57b138012b14307e7d6298092db7f3632d360653
 +F test/wal4.test 5755887f321baa4c55de0b91066fa7d0cafcac9d
 +F test/wal5.test 03043461be964ff80df96d629a7f8db1a95e1b37
 +F test/wal6.test 557fab4cc02b4ce2adf1d0f8821cb8acdaa1304f
  F test/wal64k.test 163655ecd2cb8afef4737cac2a40fdd2eeaf20b8
 -F test/wal7.test 2ae8f427d240099cc4b2dfef63cff44e2a68a1bd
 -F test/wal8.test 75c42e1bc4545c277fed212f8fc9b7723cd02216
 +F test/wal7.test 18cf68ab8010ae0a2baaa48e5b59567a9503e63e
 +F test/wal8.test c35dd183708148120928dca908641c361f58062c
  F test/wal9.test 378e76a9ad09cd9bee06c172ad3547b0129a6750
 -F test/wal_common.tcl a98f17fba96206122eff624db0ab13ec377be4fe
 -F test/walbak.test b9f68e39646375c2b877be906babcc15d38b4877
 -F test/walbig.test f437473a16cfb314867c6b5d1dbcd519e73e3434
 +F test/wal_common.tcl 15f152fd55703975878741beca6cfa4209d5b3b3
 +F test/walbak.test 67339b9e54db0cdaaf21287349bc8056e2919f96
 +F test/walbig.test 3ca3d94751b80054eed5bda20a1339ae1f619483
  F test/walblock.test be48f3a75eff0b4456209f26b3ce186c2015497d
 -F test/walcksum.test bb234a1bb42248b3515d992b719708015c384278
 -F test/walcrash.test 21038858cc552077b0522f50b0fa87e38139306a
 -F test/walcrash2.test a0edab4e5390f03b99a790de89aad15d6ec70b36
 -F test/walcrash3.test e426aa58122d20f2b9fbe9a507f9eb8cab85b8af
 -F test/walfault.test 1f8389f7709877e9b4cc679033d71d6fe529056b
 -F test/walhook.test ed00a40ba7255da22d6b66433ab61fab16a63483
 -F test/walmode.test 4022fe03ae6e830583672caa101f046438a0473c
 -F test/walnoshm.test 84ca10c544632a756467336b7c3b864d493ee496
 +F test/walcksum.test add42a54d7c7d9bc72a913792022a195293bef2b
 +F test/walcrash.test 065a041da88f980df3830f09b7fe308337bb594a
 +F test/walcrash2.test 6eb6842d34cc5955726264c80566963c32a9cbea
 +F test/walcrash3.test 279640ffafa23f7564529ccd69bfb97849ccae9d
 +F test/walfault.test f4160abd02d583d06d7ea9554e7a3f749f6b3410
 +F test/walhook.test 5d2bdb04fd3e220e2f96e6b566d57e00020bdaec
 +F test/walmode.test aa45339b4afa435dde5d88e71a95459cc221a3f4
 +F test/walnoshm.test 559b878f3aab838971d820329ca35f1caa7b038e
  F test/waloverwrite.test dad2f26567f1b45174e54fbf9a8dc1cb876a7f03
 -F test/walpersist.test 8c6b7e3ec1ba91b5e4dc4e0921d6d3f87cd356a6
 +F test/walpersist.test abd956d66e2f36d2d9d05d3a969f48be6d2ddbec
  F test/walprotocol.test 059cb75484a1ecf6357a2c1b3324b8156749221e
 -F test/walro.test 34422d1d95aaff0388f0791ec20edb34e2a3ed57
 -F test/walshared.test 0befc811dcf0b287efae21612304d15576e35417
 -F test/walslow.test c05c68d4dc2700a982f89133ce103a1a84cc285f
 -F test/walthread.test de8dbaf6d9e41481c460ba31ca61e163d7348f8e
 +F test/walro.test 256ea9380825a34be43e8ff02bd1e240f1f62e8c
 +F test/walshared.test 04590b10c677f75318701818c50bc0dda5da64ab
 +F test/walslow.test 07a51cbe9d4895d0a90c7af76d14a62d363ac162
 +F test/walthread.test c13f5a12fbd9d81e58f49875dc9dd8a52a84cf03
- F test/where.test 9902a3d84e9bc80357a2c54ed0e76c0d6d04a867
+ F test/where.test f0c325563acde44f2c4ea6ba348e9e29f7121757
  F test/where2.test af78c55589cbc82d793449493adba0dc3d659f23
  F test/where3.test 1ad55ba900bd7747f98b6082e65bd3e442c5004e
  F test/where4.test 4a371bfcc607f41d233701bdec33ac2972908ba8
@@@ -1434,7 -1429,28 +1434,28 @@@ F tool/vdbe_profile.tcl 246d0da094856d7
  F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
  F tool/warnings.sh a98af506df552f3b3c0d904f94e4cdc4e1a6d598
  F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
- P 82e7e31b09097b24876f69df56cdd8f4c1aad1f1 64386fa339adb91439da979d74062f67a6ec68fd
- R 9fed06e98eafd73de0f2f0b839b0c312
+ F vsixtest/App.xaml b76d3b48860e7454775c47ea38ffea9c4abe3e85
+ F vsixtest/App.xaml.cpp c465147f50871165c60ca16955219f6c5812d6d8
+ F vsixtest/App.xaml.h 4a9768e2983d05600ad1e1c2f1b00a132967da9f
+ F vsixtest/Assets/LockScreenLogo.scale-200.png e820c9a3deb909197081b0bf3216c06e13905f0a
+ F vsixtest/Assets/SplashScreen.scale-200.png cab70988ca71bebec7bfeb3b6dbafe17b9ab0b4a
+ F vsixtest/Assets/Square150x150Logo.scale-200.png e17b40817db7a239fc239d83efcc951fb824e3ff
+ F vsixtest/Assets/Square44x44Logo.scale-200.png 2f166237094dea94d952d10b9eeae81806844f1c
+ F vsixtest/Assets/Square44x44Logo.targetsize-24_altform-unplated.png 5f6a6d391b95a3061ccca6e6fdd6955ede63b4ed
+ F vsixtest/Assets/StoreLogo.png 0828b7257db74a4ecd5eeb6b7b4971f0fdc4d9d1
+ F vsixtest/Assets/Wide310x150Logo.scale-200.png 04ddefe5bc5f43ae12a7433f6f236ddab101ac42
+ F vsixtest/MainPage.xaml 34f49897e3ca533a7e74506ba0759b66eebce151
+ F vsixtest/MainPage.xaml.cpp 7f31fc6de751b64676c0924c97a5485d950a91d7
+ F vsixtest/MainPage.xaml.h cc05cca10d50a003f6c6e4448b701cdd07f52f29
+ F vsixtest/Package.appxmanifest 6b6db1eb7df3a315c5d681059754d5f0e0c47a93
+ F vsixtest/pch.cpp cb823cfac36f1a39a7eb0acbd7e9a0b0de8f23af
+ F vsixtest/pch.h 9cab7980f2ac4baa40807d8b5e52af32a21cf78c
+ F vsixtest/vsixtest.sln 77cadbe4e96c1fe1bf51cd77de9e9b0a12ada547
+ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
+ F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
+ F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
+ F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
 -P 374b5108087a2eae03676c0f3469b37a272145bf
 -R 1de55b3a8f2d3749e97e04af07972bbe
 -U dan
 -Z 5dfcb2d8f6d42b01529359e44d97d92b
++P 18c3ab4784a4efab2cc583ef712c4db9d127418a 424b7aee3310b9782bd312589dc3d9f287aa04b8
++R dbb807d0ab5a2b790fce1543453b7cbe
 +U drh
- Z bc58b8b56c1715f0445b9b0351cec5be
++Z 7c4ec600601ac1d4fb5bae29e99d91ad

diff --cc manifest.uuid
index 9366cc217cf39fb0a41106b86d131bb850b83d23,b891f1a56123e3fd07206cf8a0aa854eb5866026..9d115621d8799cce350baabaf5f1bdc5e154d6ea
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 18c3ab4784a4efab2cc583ef712c4db9d127418a
 -424b7aee3310b9782bd312589dc3d9f287aa04b8
++4fb4aee83da5cd1d75627f96ab431132628aeef4

diff --cc src/btree.c
Simple merge

diff --cc src/main.c
Simple merge

diff --cc src/pager.c
Simple merge

diff --cc src/pager.h
index e7efe2bae97bae4dfa0ae5938b21c2641959a6e5,38a49821502abce061611dead335dfa42d5fc039..5f40fc3141066cccf7c90e166a0ea6f7eb81eabf
--- 1/src/pager.h
--- 2/src/pager.h
+++ b/src/pager.h
@@@ -189,10 -189,8 +189,9 @@@ int sqlite3PagerMemUsed(Pager*)
  const char *sqlite3PagerFilename(Pager*, int);
  sqlite3_vfs *sqlite3PagerVfs(Pager*);
  sqlite3_file *sqlite3PagerFile(Pager*);
 +sqlite3_file *sqlite3PagerWalFile(Pager *pPager);
  sqlite3_file *sqlite3PagerJrnlFile(Pager*);
  const char *sqlite3PagerJournalname(Pager*);
- int sqlite3PagerNosync(Pager*);
  void *sqlite3PagerTempSpace(Pager*);
  int sqlite3PagerIsMemdb(Pager*);
  void sqlite3PagerCacheStat(Pager *, int, int, int *);

diff --cc src/pragma.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