Merge latest trunk changes with this branch.

FossilOrigin-Name: 59caca4387e97231834a3bffdbed8636be4e8e19

diff --cc main.mk
Simple merge

diff --cc manifest
index 7b7e824272855dd62291fd4c608f5dfd3030d95e,463e7f81dd1c281614d033288cc2749ba1ebd657..a6c352d7e84b0f28287811d1889fffdd1b433d3c
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,10 -1,10 +1,10 @@@
- C Fix\sa\sproblem\sin\sthe\sschemalint\scode\sthat\scomes\sup\swhen\sa\ssub-query\suses\sone\sor\smore\sof\sthe\ssame\stables\sas\sits\sparent.
- D 2016-03-09T08:07:31.577
- F Makefile.in dac2776c84e0d533b158a9af6e57e05c4a6b19f3
 -C Simplifications\sto\sthe\smemjournal.c\slogic\sto\sfacilitate\stesting.
 -D 2016-03-09T04:17:17.100
++C Merge\slatest\strunk\schanges\swith\sthis\sbranch.
++D 2016-03-09T08:08:51.626
+ F Makefile.in f53429fb2f313c099283659d0df6f20f932c861f
  F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
- F Makefile.msc b0493f10caddb8adf992a4e6f1943141fc7c6816
+ F Makefile.msc df0bf9ff7f8b3f4dd9fb4cc43f92fe58f6ec5c66
  F README.md 8ecc12493ff9f820cdea6520a9016001cb2e59b7
- F VERSION 866588d1edf0ccb5b0d33896974338f97564f719
+ F VERSION c6b1f51809551d60ad001e6d87cf3ab2c7f54b6f
  F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
  F art/sqlite370.eps aa97a671332b432a54e1d74ff5e8775be34200c2
  F art/sqlite370.ico af56c1d00fee7cd4753e8631ed60703ed0fc6e90
@@@ -272,7 -274,7 +274,7 @@@ F ext/userauth/userauth.c 5fa3bdb492f48
  F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
  F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8
  F magic.txt 8273bf49ba3b0c8559cb2774495390c31fd61c60
- F main.mk eeff3d12ebe5945dac88147c641407c22a731131
 -F main.mk 91cfc30d0fa295be28a86657ad3b1053f0428c9e
++F main.mk e3b21467eb50c2dff9bf4003a02aea753bfe7e35
  F mkso.sh fd21c06b063bb16a5d25deea1752c2da6ac3ed83
  F mptest/config01.test 3c6adcbc50b991866855f1977ff172eb6d901271
  F mptest/config02.test 4415dfe36c48785f751e16e32c20b077c28ae504
@@@ -309,12 -311,11 +311,11 @@@ F src/global.c 884d4c7eba9f5fc25c96a23b
  F src/hash.c 4263fbc955f26c2e8cdc0cf214bc42435aa4e4f5
  F src/hash.h c8f3c31722cf3277d03713909761e152a5b81094
  F src/hwtime.h d32741c8f4df852c7d959236615444e2b1063b08
- F src/insert.c 046199e085e69e05af7bef197d53c5b4b402b6fa
- F src/journal.c b4124532212b6952f42eb2c12fa3c25701d8ba8d
- F src/legacy.c b1b0880fc474abfab89e737b0ecfde0bd7a60902
- F src/loadext.c 84996d7d70a605597d79c1f1d7b2012a5fd34f2b
- F src/main.c 816b9a98a6aca0fd643e77f3610d6a4a1a4c7e24
- F src/malloc.c 337e9808b5231855fe28857950f4f60ae42c417f
+ F src/insert.c 723d5d708cdb61bdd47c00b9f07c75be45aefc09
+ F src/legacy.c 75d3023be8f0d2b99d60f905090341a03358c58e
+ F src/loadext.c 9e2a41adcaff16ebc1ebff1f336cbf33de55396f
 -F src/main.c 29ea8ebb23ceb5159da167e18d5c807fbb1545c4
++F src/main.c 787fc7ccd341ae80695fb3954ab95b84b7b3a146
+ F src/malloc.c 1443d1ad95d67c21d77af7ae3f44678252f0efec
  F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
  F src/mem1.c 6919bcf12f221868ea066eec27e579fed95ce98b
  F src/mem2.c f1940d9e91948dd6a908fbb9ce3835c36b5d83c3
@@@ -328,38 -329,37 +329,38 @@@ F src/mutex_noop.c 9d4309c075ba9cc7249e
  F src/mutex_unix.c 27bb6cc49485ee46711a6580ab7b3f1402211d23
  F src/mutex_w32.c 5e6fe1c298fb5a8a15aaed4161d5759311431c17
  F src/notify.c 9711a7575036f0d3040ba61bc6e217f13a9888e7
- F src/os.c 8fd25588eeba74068d41102d26810e216999b6c8
+ F src/os.c f89e3ca1c2e3d5015b847aec60371c474acbac82
  F src/os.h 3e57a24e2794a94d3cf2342c6d9a884888cd96bf
- F src/os_common.h abdb9a191a367793268fe553d25bab894e986a0e
+ F src/os_common.h b2f4707a603e36811d9b1a13278bffd757857b85
  F src/os_setup.h c9d4553b5aaa6f73391448b265b89bed0b890faa
- F src/os_unix.c 821ed110197175165cf2f50b0930c7ff9a24504c
- F src/os_win.c ccf29ddded3e41e506b6bd98c1171aa0963b23f2
+ F src/os_unix.c f5bac8e74aaefc4ea520e43b4540793c3b8a9e8f
+ F src/os_win.c f0d7aa603eb6262143d7169a222aea07c4fca91d
  F src/os_win.h eb7a47aa17b26b77eb97e4823f20a00b8bda12ca
- F src/pager.c 67cd2fbab58d0e35fed5f81432856f4f0af9fc6d
- F src/pager.h f3eb324a3ff2408b28bab7e81c1c55c13720f865
- F src/parse.y d7bff41d460f2df96fb890f36700e85cb0fc5634
- F src/pcache.c 73895411fa6b7bd6f0091212feabbe833b358d23
+ F src/pager.c 2d950142528e5d9b291a1160443d7ade0d90700d
+ F src/pager.h e1d38a2f14849e219df0f91f8323504d134c8a56
+ F src/parse.y 5ea8c81c5c41b27887f41b4a7e1c58470d7d3821
+ F src/pcache.c 647bb53a86b7bbcf55ad88089b3ea5a9170b90df
  F src/pcache.h 4d0ccaad264d360981ec5e6a2b596d6e85242545
  F src/pcache1.c 72f644dc9e1468c72922eff5904048427b817051
- F src/pragma.c cfd521558fccd3864ec664af09a061e9e692583f
 -F src/pragma.c c7061870c235702a513ce4152fe978faf3f282eb
++F src/pragma.c 3ca4a32189ffa5d0b2a908c9d55bd7fcd2717a62
  F src/pragma.h 64c78a648751b9f4f297276c4eb7507b14b4628c
- F src/prepare.c c12b786713df3e8270c0f85f988c5359d8b4d87c
+ F src/prepare.c 22df6171aec1d86904ed2ad30c2348a5748aa04e
  F src/printf.c 63e6fb12bbe702dd664dc3703776c090383a5a26
  F src/random.c ba2679f80ec82c4190062d756f22d0c358180696
- F src/resolve.c 9f7ce3a3c087afb7597b7c916c99126ff3f12f0c
+ F src/resolve.c b8f7174e5f8c33c44ded3a25a973d0bb89228c20
  F src/rowset.c 9fe4b3ad7cc00944386bb600233d8f523de07a6e
- F src/select.c ff80004a9a6ece891a8d9327a88e7b6e2588ee6d
- F src/shell.c 2cde87e03712204231167c4a6c61b0eb5129e105
+ F src/select.c 137b31daa84d57d67847bf621bb54f3353e2077b
 -F src/shell.c 5e0ab1e708dc294330ccd8230536e1801f60822e
 -F src/sqlite.h.in 0235586b3fb639e85998d495c90f007657fd82af
++F src/shell.c 4aba7844546ffd02b728a9509226a6e3c0462f77
 +F src/shell_indexes.c 23c4b7f7bb8e9b0a8b912c389a85922939bb0769
- F src/sqlite.h.in c7db059d3b810b70b83d9ed1436fa813eba22462
++F src/sqlite.h.in 9f0fee10494624d03686fabcc270ce8d12fcb65b
  F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
  F src/sqlite3ext.h dfbe62ffd95b99afe2140d8c35b180d11924072d
- F src/sqliteInt.h a1d0d9613ed7da3657396795e44991fef188c8ee
- F src/sqliteLimit.h 216557999cb45f2e3578ed53ebefe228d779cb46
 -F src/sqliteInt.h 24e2eed36a68d48bd43d866adb528001b0795275
++F src/sqliteInt.h dc193eb8a9922528a370eae11e2e66886e0f29a3
+ F src/sqliteLimit.h 7b28cf72cbd52f178bfc97ea266445e351f2cd24
  F src/status.c 70912d7be68e9e2dbc4010c93d344af61d4c59ba
- F src/table.c 51b46b2a62d1b3a959633d593b89bab5e2c9155e
- F src/tclsqlite.c 94ef6e2794220c5b6064d4c78ec7169a8c5cc45d
- F src/test1.c 4f1b42699068b7806af3111786f5ad760c2c1ff7
+ F src/table.c 5226df15ab9179b9ed558d89575ea0ce37b03fc9
+ F src/tclsqlite.c 54dca4eaf3a9cb0a4b845ef54ffa99225c30a52e
+ F src/test1.c f14a6f9e2cff6cba4d83e2b0c52857f61886cead
  F src/test2.c 5586f43fcd9a1be0830793cf9d354082c261b25b
  F src/test3.c a8887dabbbee3059af338f20d290084a63ed1b0f
  F src/test4.c d168f83cc78d02e8d35567bb5630e40dcd85ac1e
@@@ -406,32 -407,32 +408,32 @@@ F src/test_vfstrace.c bab9594adc976cbe6
  F src/test_windirent.c 8f5fada630348558d5745b334702f301da1ffc61
  F src/test_windirent.h b12055cab6227f7be10f5c19296f67c60cc5e2a5
  F src/test_wsd.c 41cadfd9d97fe8e3e4e44f61a4a8ccd6f7ca8fe9
- F src/threads.c bbfb74450643cb5372a43ad4f6cffd7e9dfcecb0
- F src/tokenize.c 813934be70597edfbb685ae08fc4c8b549cf5a1e
- F src/treeview.c dc39ccf04e9331237388b9cb73289c9d87ea050b
+ F src/threads.c 4ae07fa022a3dc7c5beb373cf744a85d3c5c6c3c
+ F src/tokenize.c 3d338cdd00d916ce8a05c397001d64ed58e6fe1c
+ F src/treeview.c e4b41a37530a191579d3c53142cc44ee2eb99373
  F src/trigger.c e14840ee0c3e549e758ec9bf3e4146e166002280
- F src/update.c 310ca7adb86a7d1f2afae46905b21c83580f3e17
- F src/utf.c 10cc2519e82e3369344d0969ad4b1a333dc86d18
- F src/util.c 49ce0a65306c1c51d61cb5bc214c71cb62452de6
- F src/vacuum.c 2ddd5cad2a7b9cef7f9e431b8c7771634c6b1701
- F src/vdbe.c c193299e595a13eba247738e22fce25c49346a6c
+ F src/update.c 56b3db7edff0110360a12b76af97c39ebe3ea8b8
+ F src/utf.c 699001c79f28e48e9bcdf8a463da029ea660540c
+ F src/util.c 12800a93f0664f41575f96799eb881a786d565e6
+ F src/vacuum.c feb1eabb20987983d9350cad98299b21fa811f52
+ F src/vdbe.c 87ae3a5657fefed7875f3eb30e7ababd48013d71
  F src/vdbe.h c743791f723049db94f009e3e30958952bc2d512
- F src/vdbeInt.h 4b69d5451bcadd473e745af53ef1e8abfdce0a79
- F src/vdbeapi.c 9324f6baee1a1b2284c6543e98f916888a81e459
- F src/vdbeaux.c deae5d3bd45da0e57c7d9e1d7436333d142dc3bb
+ F src/vdbeInt.h 49a74fe5ece206d2d8666ba9afaf1abeda5f123b
+ F src/vdbeapi.c 95b1f8e527240a18a9aea41a655b013bf07a7009
+ F src/vdbeaux.c 2c15cf88de4df97428318c8cfac0dea873dae451
  F src/vdbeblob.c 3b570b730109e8f653d9d2081649f6e7015113db
- F src/vdbemem.c 68fcfac37dc6601d98c32cc5adee4d39f2c1b7b4
- F src/vdbesort.c ef3c6d1f1a7d44cf67bb2bee59ea3d1fe5bad174
+ F src/vdbemem.c 9b0cb32cc267ef026515f15a3594d5ff91fe4dfc
+ F src/vdbesort.c 307460bfa4de4d1c3901fcd42089159131e34062
  F src/vdbetrace.c f75c5455d8cf389ef86a8bfdfd3177e0e3692484
- F src/vtab.c bef51b4f693d82b4b0184457faa8625654534091
+ F src/vtab.c fd69fd398e23e57ea4ea377d8a44b6998fc569c7
  F src/vxworks.h d2988f4e5a61a4dfe82c6524dd3d6e4f2ce3cdb9
- F src/wal.c d21b99fd1458159d0b1ecdccc8ee6ada4fdc4c54
+ F src/wal.c 10deb6b43887662691e5f53d10b3c171c401169b
  F src/wal.h 2f7c831cf3b071fa548bf2d5cac640846a7ff19c
  F src/walker.c 0f142b5bd3ed2041fc52d773880748b212e63354
- F src/where.c 59f267a53d29db13880597011323745b69e14f24
- F src/whereInt.h 78b6b4de94db84aecbdc07fe3e38f648eb391e9a
- F src/wherecode.c 791a784bbf8749d560fdb0b990b607bc4f44a38d
- F src/whereexpr.c de117970b29471177a6901d60ad83a194671dc03
 -F src/where.c f2859a4f9e3ce0585fd75648fb5cae9f985c458d
++F src/where.c 2cbcacd9ae9bc8570cb83eaf3400700dbf90ac87
+ F src/whereInt.h 93297d56edd137b7ea004490690fb6e2ce028a34
+ F src/wherecode.c 863aedf086131743763c1960637fde904eadc442
+ F src/whereexpr.c fb87944b1254234e5bba671aaf6dee476241506a
  F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2
  F test/affinity2.test a6d901b436328bd67a79b41bb0ac2663918fe3bd
  F test/aggerror.test a867e273ef9e3d7919f03ef4f0e8c0d2767944f2
@@@ -1019,12 -1024,11 +1025,12 @@@ F test/sharedA.test 0cdf1a76dfa00e6beee
  F test/sharedB.test 16cc7178e20965d75278f410943109b77b2e645e
  F test/shared_err.test 2f2aee20db294b9924e81f6ccbe60f19e21e8506
  F test/sharedlock.test 5ede3c37439067c43b0198f580fd374ebf15d304
- F test/shell1.test ce5e744870387164703bf2dee2cc9753e4a71513
+ F test/shell1.test a45b424ec23a4b946848ff9e1af5186c677162ab
  F test/shell2.test 12b8bf901b0e3a8ac58cf5c0c63a0a388d4d1862
  F test/shell3.test 5e8545ec72c4413a0e8d4c6be56496e3c257ca29
- F test/shell4.test ddf0a99044e2245a87fc17423e3aaa1445b3243b
+ F test/shell4.test f43e250139dc5dc5f0f2ec1752c50284a1ede102
  F test/shell5.test c04e9f9f948305706b88377c464c7f08ce7479f9
 +F test/shell6.test 4ce53ce53e1206742e003b5ae609b6c2be438df1
  F test/shortread1.test bb591ef20f0fd9ed26d0d12e80eee6d7ac8897a3
  F test/show_speedtest1_rtree.tcl 32e6c5f073d7426148a6936a0408f4b5b169aba5
  F test/shrink.test 1b4330b1fd9e818c04726d45cb28db73087535ce
@@@ -1428,9 -1432,30 +1435,30 @@@ F tool/varint.c 5d94cb5003db9dbbcbcc5df
  F tool/vdbe-compress.tcl 5926c71f9c12d2ab73ef35c29376e756eb68361c
  F tool/vdbe_profile.tcl 246d0da094856d72d2c12efec03250d71639d19f
  F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
- F tool/warnings.sh 48bd54594752d5be3337f12c72f28d2080cb630b
+ F tool/warnings.sh a98af506df552f3b3c0d904f94e4cdc4e1a6d598
  F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
- P 0b73406595c9a077399b0f4c17af3a826cf3612f
- R d77c52a71510d468f62d262501df9c9f
+ 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 7f00d80c63b15376391f661d872f2b29a970702d
 -R 3dfe324883f59e455687da1f2d0dc6fa
 -U drh
 -Z 09a89868e4ca6983fd083bec8c9845f2
++P fc18cc9293fb0080b7152c16baac49f44e2db7b3 8baa2c2c7698e03418531482a8314a5d7ae2c7d3
++R 450ba648de3c5f9783d9a3140277593a
 +U dan
- Z c51c58b805618dc47dc45d8f0cd33733
++Z 1186a7b0c3808314b7a93e4b95a66f1c

diff --cc manifest.uuid
index e9344a7af68feba1b94f3a8977b3b6dbeffcfebb,2a3c3e97a08809759466c247bd240689018c0c94..3e67f3151ecb6932bba42873c0462bf3664de249
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- fc18cc9293fb0080b7152c16baac49f44e2db7b3
 -8baa2c2c7698e03418531482a8314a5d7ae2c7d3
++59caca4387e97231834a3bffdbed8636be4e8e19

diff --cc src/main.c
Simple merge

diff --cc src/pragma.c
Simple merge

diff --cc src/shell.c
index e2fe41291d16a26203d8c4f1d46f96fcff169ccc,789a464d09125038ee0fdd12ebeeff1273e3263c..675e2ffd1984b2e923b99e955b76038d582b170b
--- 1/src/shell.c
--- 2/src/shell.c
+++ b/src/shell.c
@@@ -593,8 -592,8 +593,9 @@@ typedef struct ShellState ShellState
  struct ShellState {
    sqlite3 *db;           /* The database */
    int echoOn;            /* True to echo input commands */
-   int autoEQP;           /* Run EXPLAIN QUERY PLAN prior to each SQL stmt */
+   int autoExplain;       /* Automatically turn on .explain mode */
+   int autoEQP;           /* Run EXPLAIN QUERY PLAN prior to seach SQL stmt */
 +  int bRecommend;        /* Instead of sqlite3_exec(), recommend indexes */
    int statsOn;           /* True to display memory stats before each finalize */
    int scanstatsOn;       /* True to display scan stats before each finalize */
    int countChanges;      /* True to display change counts */

diff --cc src/sqlite.h.in
index 03d3d72f6f56f156547d5b60af9428ddaa04fd23,3b267974b55804f367117c9779820d2a83e5aaf7..960925ff62b0c58ba5470f782d701a4d85d2ead4
--- 1/src/sqlite.h.in
--- 2/src/sqlite.h.in
+++ b/src/sqlite.h.in
@@@ -1904,20 -1919,25 +1919,34 @@@ struct sqlite3_mem_methods 
  ** following this call.  The second parameter may be a NULL pointer, in
  ** which case the trigger setting is not reported back. </dd>
  **
+ ** <dt>SQLITE_DBCONFIG_ENABLE_FTS3_TOKENIZER</dt>
+ ** <dd> ^This option is used to enable or disable the two-argument
+ ** version of the [fts3_tokenizer()] function which is part of the
+ ** [FTS3] full-text search engine extension.
+ ** There should be two additional arguments.
+ ** The first argument is an integer which is 0 to disable fts3_tokenizer() or
+ ** positive to enable fts3_tokenizer() or negative to leave the setting
+ ** unchanged.
+ ** The second parameter is a pointer to an integer into which
+ ** is written 0 or 1 to indicate whether fts3_tokenizer is disabled or enabled
+ ** following this call.  The second parameter may be a NULL pointer, in
+ ** which case the new setting is not reported back. </dd>
+ **
  ** </dl>
  */
- #define SQLITE_DBCONFIG_LOOKASIDE       1001  /* void* int int */
- #define SQLITE_DBCONFIG_ENABLE_FKEY     1002  /* int int* */
- #define SQLITE_DBCONFIG_ENABLE_TRIGGER  1003  /* int int* */
+ #define SQLITE_DBCONFIG_LOOKASIDE             1001 /* void* int int */
+ #define SQLITE_DBCONFIG_ENABLE_FKEY           1002 /* int int* */
+ #define SQLITE_DBCONFIG_ENABLE_TRIGGER        1003 /* int int* */
+ #define SQLITE_DBCONFIG_ENABLE_FTS3_TOKENIZER 1004 /* int int* */
 +#define SQLITE_DBCONFIG_WHEREINFO       1004  /* xWhereInfo void* */
 +
 +#define SQLITE_WHEREINFO_TABLE   1
 +#define SQLITE_WHEREINFO_EQUALS  2
 +#define SQLITE_WHEREINFO_RANGE   3
 +#define SQLITE_WHEREINFO_ORDERBY 4
 +#define SQLITE_WHEREINFO_BEGINOR 5
 +#define SQLITE_WHEREINFO_ENDOR   6
 +#define SQLITE_WHEREINFO_NEXTOR  7
  
  
  /*

diff --cc src/sqliteInt.h
Simple merge

diff --cc src/where.c
Simple merge