Merge all recent enhancements and fixes from trunk into the apple-osx branch.

FossilOrigin-Name: dadedf41c7cced0cea5c69584ff11405c2fc53518c7ddbea2e4e51cc44b4cd0a

diff --cc Makefile.in
Simple merge

diff --cc ext/fts5/test/fts5misc.test
index 8d3742417afadbf5e66bea3db6fff6f93448ccf7,9abc92b23f01dcc7e801fc75964d3ac260c82c1e..8ffb1bfe97f94dad1fcbb3da456a2e2de4dd74b5
--- 1/ext/fts5/test/fts5misc.test
--- 2/ext/fts5/test/fts5misc.test
+++ b/ext/fts5/test/fts5misc.test
@@@ -106,6 -106,222 +106,221 @@@ do_execsql_test 2.2.5 
    INSERT INTO vt0(vt0) VALUES('integrity-check');
  }
  
+ #-------------------------------------------------------------------------
+ reset_db
+ do_execsql_test 3.0 {
+   CREATE VIRTUAL TABLE vt0 USING fts5(a);
+   PRAGMA reverse_unordered_selects = true;
+   INSERT INTO vt0 VALUES('365062398'), (0), (0);
+   INSERT INTO vt0(vt0, rank) VALUES('pgsz', '38');
+ }
+ do_execsql_test 3.1 {
+   UPDATE vt0 SET a = 399905135; -- unexpected: database disk image is malformed
+ }
+ do_execsql_test 3.2 {
+   INSERT INTO vt0(vt0) VALUES('integrity-check');
+ }
  
- finish_test
+ #-------------------------------------------------------------------------
+ reset_db
+ do_execsql_test 4.0 {
+   CREATE VIRTUAL TABLE vt0 USING fts5(c0);
+   INSERT INTO vt0(c0) VALUES ('xyz');
+ }
+ 
+ do_execsql_test 4.1 {
+   BEGIN;
+     INSERT INTO vt0(c0) VALUES ('abc');
+     INSERT INTO vt0(vt0) VALUES('rebuild');
+   COMMIT;
+ }
+ 
+ do_execsql_test 4.2 {
+   INSERT INTO vt0(vt0) VALUES('integrity-check');
+ }
+ 
+ do_execsql_test 4.3 {
+   BEGIN;
+     INSERT INTO vt0(vt0) VALUES('rebuild');
+     INSERT INTO vt0(vt0) VALUES('rebuild');
+   COMMIT;
+ }
+ 
+ do_execsql_test 4.4 {
+   INSERT INTO vt0(vt0) VALUES('integrity-check');
+ }
+ 
+ #-------------------------------------------------------------------------
+ # Ticket [81a7f7b9].
+ #
+ reset_db
+ do_execsql_test 5.0 {
+   CREATE VIRTUAL TABLE vt0 USING fts5(c0, c1);
+   INSERT INTO vt0(vt0, rank) VALUES('pgsz', '65536');
+   WITH s(i) AS (
+     SELECT 1 UNION ALL SELECT i+1 FROM s WHERE i<1236
+   )
+   INSERT INTO vt0(c0) SELECT '0' FROM s;
+ } {}
+ 
+ do_execsql_test 5.1 {
+   UPDATE vt0 SET c1 = 'T,D&p^y/7#3*v<b<4j7|f';
+ }
+ 
+ do_execsql_test 5.2 {
+   INSERT INTO vt0(vt0) VALUES('integrity-check');
+ }
+ 
+ do_catchsql_test 5.3 {
+   INSERT INTO vt0(vt0, rank) VALUES('pgsz', '65537');
+ } {1 {SQL logic error}}
+ 
+ #-------------------------------------------------------------------------
+ # Ticket [d392017c].
+ #
+ reset_db
+ do_execsql_test 6.0 {
+   CREATE VIRTUAL TABLE vt0 USING fts5(c0);
+   WITH s(i) AS (
+     SELECT 1 UNION ALL SELECT i+1 FROM s WHERE i<10000
+   )
+   INSERT INTO vt0(c0) SELECT '0' FROM s;
+   INSERT INTO vt0(vt0, rank) VALUES('crisismerge', 2000);
+   INSERT INTO vt0(vt0, rank) VALUES('automerge', 0);
+ } {}
+ 
+ do_execsql_test 6.1 {
+   INSERT INTO vt0(vt0) VALUES('rebuild');
+ }
+ 
+ #-------------------------------------------------------------------------
+ #
+ reset_db
+ do_execsql_test 7.0 {
+   CREATE VIRTUAL TABLE t1 USING fts5(x);
+   INSERT INTO t1(rowid, x) VALUES(1, 'hello world');
+   INSERT INTO t1(rowid, x) VALUES(2, 'well said');
+   INSERT INTO t1(rowid, x) VALUES(3, 'hello said');
+   INSERT INTO t1(rowid, x) VALUES(4, 'well world');
+ 
+   CREATE TABLE t2 (a, b);
+   INSERT INTO t2 VALUES(1, 'hello');
+   INSERT INTO t2 VALUES(2, 'world');
+   INSERT INTO t2 VALUES(3, 'said');
+   INSERT INTO t2 VALUES(4, 'hello');
+ }
+ 
+ do_execsql_test 7.1 {
+   SELECT rowid FROM t1 WHERE (rowid, x) IN (SELECT a, b FROM t2); 
+ }
  
 -
+ do_execsql_test 7.2 {
+   SELECT rowid FROM t1 WHERE rowid=2 AND t1 = 'hello';
+ }
+ 
+ #-------------------------------------------------------------------------
+ #
+ reset_db
+ do_execsql_test 8.0 {
+   CREATE VIRTUAL TABLE vt0 USING fts5(c0, tokenize = "ascii", prefix = 1);
+   INSERT INTO vt0(c0) VALUES (x'd1');
+ }
+ 
+ do_execsql_test 8.1 {
+   INSERT INTO vt0(vt0) VALUES('integrity-check');
+ }
+ 
+ #-------------------------------------------------------------------------
+ #
+ reset_db
+ do_execsql_test 9.0 {
+   CREATE VIRTUAL TABLE t1 using FTS5(mailcontent);
+   insert into t1(rowid, mailcontent) values
+       (-4764623217061966105, 'we are going to upgrade'),
+       (8324454597464624651, 'we are going to upgrade');
+ }
+ 
+ do_execsql_test 9.1 {
+   INSERT INTO t1(t1) VALUES('integrity-check');
+ }
+ 
+ do_execsql_test 9.2 {
+   SELECT rowid FROM t1('upgrade');
+ } {
+   -4764623217061966105 8324454597464624651
+ }
+ 
+ #-------------------------------------------------------------------------
+ #
+ reset_db
+ do_execsql_test 10.0 {
+   CREATE VIRTUAL TABLE vt1 USING fts5(c1, c2, prefix = 1, tokenize = "ascii");
+   INSERT INTO vt1 VALUES (x'e4', '䔬');
+ }
+ 
+ do_execsql_test 10.1 {
+   SELECT quote(CAST(c1 AS blob)), quote(CAST(c2 AS blob)) FROM vt1
+ } {X'E4' X'E494AC'}
+ 
+ do_execsql_test 10.2 {
+   INSERT INTO vt1(vt1) VALUES('integrity-check');
+ }
+ 
+ #-------------------------------------------------------------------------
+ #
+ reset_db
+ do_execsql_test 11.0 {
+   CREATE VIRTUAL TABLE vt0 USING fts5(
+       c0, prefix = 71, tokenize = "porter ascii", prefix = 9
+   );
+ } {}
+ do_execsql_test 11.1 {
+   BEGIN;
+   INSERT INTO vt0(c0) VALUES (x'e8');
+ }
+ do_execsql_test 11.2 {
+   INSERT INTO vt0(vt0) VALUES('integrity-check');
+ }
+ 
+ #-------------------------------------------------------------------------
+ # Ticket [752fdbf6] 
+ #
+ reset_db
+ do_execsql_test 11.0 {
+   PRAGMA encoding = 'UTF-16';
+   CREATE VIRTUAL TABLE vt0 USING fts5(c0, c1);
+   INSERT INTO vt0(vt0, rank) VALUES('pgsz', '37');
+   INSERT INTO vt0(c0, c1) VALUES (0.66077, 1957391816);
+ }
+ do_execsql_test 11.1 {
+   INSERT INTO vt0(vt0) VALUES('integrity-check');
+ }
+ 
+ #-------------------------------------------------------------------------
+ # Ticket [7c0e06b16] 
+ #
+ do_execsql_test 12.0 {
+   CREATE TABLE t1(a, b, rank);
+   INSERT INTO t1 VALUES('a', 'hello', '');
+   INSERT INTO t1 VALUES('b', 'world', '');
+ 
+   CREATE VIRTUAL TABLE ft USING fts5(a);
+   INSERT INTO ft VALUES('b');
+   INSERT INTO ft VALUES('y');
+ 
+   CREATE TABLE t2(x, y, ft);
+   INSERT INTO t2 VALUES(1, 2, 'x');
+   INSERT INTO t2 VALUES(3, 4, 'b');
+ }
+ 
+ do_execsql_test 12.1 {
+   SELECT * FROM t1 NATURAL JOIN ft WHERE ft MATCH('b')
+ } {b world {}}
+ do_execsql_test 12.2 {
+   SELECT * FROM ft NATURAL JOIN t1 WHERE ft MATCH('b')
+ } {b world {}}
+ do_execsql_test 12.3 {
+   SELECT * FROM t2 JOIN ft USING (ft)
+ } {3 4 b b}
+ 
+ finish_test

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

diff --cc main.mk
Simple merge

diff --cc manifest
index 3316edab6b2903c14699e0ac13248a01f58a5804,db3464521a07c6419a343f2f8bbf90f16085e316..5a7aa35bf55e200e989dafe202703c0d2aad5d71
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,13 -1,13 +1,13 @@@
- C Do\snot\sallow\sshadow\stables\sto\sbe\sdropped\sin\sdefensive\smode.
- D 2019-11-16T18:36:12.809
 -C Fix\sthe\surifuncs.c\sextension\s(used\sfor\stesting\sand\sdebugging\sonly)\sso\sthat\nthe\ssqlite3_filename_database()\sSQL\sfunction\sand\sits\ssiblings\scorrectly\shandle\nan\sinvalid\sschema\sname\spassed\sin\sas\sthe\sargument.
 -D 2020-01-14T16:50:09.276
++C Merge\sall\srecent\senhancements\sand\sfixes\sfrom\strunk\sinto\sthe\sapple-osx\sbranch.
++D 2020-01-15T12:49:49.240
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
- F Makefile.in cf6b06cd6b4d9325650024e7946a55e3f589c059b6810fedadfe3e55c045f4b0
 -F Makefile.in 9dfc7936f675785309b74d09202bb656732325e65df889e5aaa18cc8932e5b0c
++F Makefile.in e10c86c00389ba54b1e0ec374246bb8ed1037b9be97de16ad6b957fc888ca14f
  F Makefile.linux-gcc f609543700659711fbd230eced1f01353117621dccae7b9fb70daa64236c5241
- F Makefile.msc a463dca3c50d8a36094fe5c8c39077907f530b54edfc5388c66c85e2cfc8dc04
+ F Makefile.msc fab23c6b10cb6f06a7e9c407fc2e35cb184a6d653f1b793bda87fcee2eafa4f6
  F README.md 1514a365ffca3c138e00c5cc839906108a01011a6b082bad19b09781e3aa498a
- F VERSION 396c1094b353e5533180a7498086557a9c50c76f2bfb62cc5fb69cfba07d562c
+ F VERSION 081500f0aeaadc989d85aafbc717af45512018aebc73d89e5c2368fe62a600ff
  F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
  F art/sqlite370.eps aa97a671332b432a54e1d74ff5e8775be34200c2
  F art/sqlite370.ico af56c1d00fee7cd4753e8631ed60703ed0fc6e90
@@@ -186,10 -187,10 +187,10 @@@ F ext/fts5/test/fts5integrity.test 8ffa
  F ext/fts5/test/fts5interrupt.test 09613247b273a99889808ef852898177e671406fe71fdde7ea00e78ea283d227
  F ext/fts5/test/fts5lastrowid.test be98fe3e03235296585b72daad7aed5717ba0062bae5e5c18dd6e04e194c6b28
  F ext/fts5/test/fts5leftjoin.test c0b4cafb9661379e576dc4405c0891d8fcc2782680740513c4d1fc114b43d4ad
- F ext/fts5/test/fts5matchinfo.test 79129ff6c9a2d86943b287a5a8caa7ee639f6dcf004d8975d15c279374e82e35
+ F ext/fts5/test/fts5matchinfo.test 50d86da66ec5b27603dcd90ba0227f5d9deb10351cbc52974a88e24f6fc9b076
  F ext/fts5/test/fts5merge.test e92a8db28b45931e7a9c7b1bbd36101692759d00274df74d83fd29d25d53b3a6
  F ext/fts5/test/fts5merge2.test 3ebad1a59d6ad3fb66eff6523a09e95dc6367cbefb3cd73196801dea0425c8e2
- F ext/fts5/test/fts5misc.test 9a7263add42d55b8e22fc6ebbee2904390e923f4aa11d05fffaf617032f95db5
 -F ext/fts5/test/fts5misc.test 088ac5f0f5de1ad45b0f83197ab5263bcae8130156cdc901bff2375ff2b8af86
++F ext/fts5/test/fts5misc.test cc68590131a1c7fd1f4b09f95bf0d6fd46817472cfd2fd8af69f555548318c97
  F ext/fts5/test/fts5multi.test a15bc91cdb717492e6e1b66fec1c356cb57386b980c7ba5af1915f97fe878581
  F ext/fts5/test/fts5multiclient.test 5ff811c028d6108045ffef737f1e9f05028af2458e456c0937c1d1b8dea56d45
  F ext/fts5/test/fts5near.test 211477940142d733ac04fad97cb24095513ab2507073a99c2765c3ddd2ef58bd
@@@ -378,11 -383,11 +383,11 @@@ F ext/repair/test/checkfreelist01.test 
  F ext/repair/test/checkindex01.test b530f141413b587c9eb78ff734de6bb79bc3515c335096108c12c01bddbadcec
  F ext/repair/test/test.tcl 686d76d888dffd021f64260abf29a55c57b2cedfa7fc69150b42b1d6119aac3c
  F ext/rtree/README 6315c0d73ebf0ec40dedb5aa0e942bc8b54e3761
- F ext/rtree/geopoly.c c591164125808f8bba9659e92665b78412cd263e654b6f05294f3a8da7cdd9fb
- F ext/rtree/rtree.c 23838ee4ea23ae748d512cce1af082dee51f3dca56ddff31fee56785fff8fd89
+ F ext/rtree/geopoly.c cac70b5502742bd0ba8877a1329a74e86a379c78567546a2a18cf5f9c3787f73
 -F ext/rtree/rtree.c 84b939a9a558edd0461bb976b98f60012e3e574b3b17a0f44533d6f2a9aa2f2e
++F ext/rtree/rtree.c c3cd872b94031147e089368d230ac00ad0d0497a480d792be1cd967f36bebfc0
  F ext/rtree/rtree.h 4a690463901cb5e6127cf05eb8e642f127012fd5003830dbc974eca5802d9412
- F ext/rtree/rtree1.test 7573134f1b4f59df36c1b0a6de51268fd3b9c714d91f3811482263e734e416ea
- F ext/rtree/rtree2.test 5f25b01acd03470067a2d52783b2eb0a50bf836803d4342d20ca39e541220fe2
+ F ext/rtree/rtree1.test 4092a8bd2b5eafc4fafe4fe9024249c12b13e4bab23c2c3eaff57412fdf805fa
+ F ext/rtree/rtree2.test 9d9deddbb16fd0c30c36e6b4fdc3ee3132d765567f0f9432ee71e1303d32603d
  F ext/rtree/rtree3.test 4ee5d7df86040efe3d8d84f141f2962a7745452200a7cba1db06f86d97050499
  F ext/rtree/rtree4.test 304de65d484540111b896827e4261815e5dca4ce28eeecd58be648cd73452c4b
  F ext/rtree/rtree5.test 49c9041d713d54560b315c2c7ef7207ee287eba1b20f8266968a06f2e55d3142
@@@ -439,18 -445,15 +445,18 @@@ F ext/session/sessionrebase.test ccfa71
  F ext/session/sessionstat1.test 218d351cf9fcd6648f125a26b607b140310160184723c2666091b54450a68fb5
  F ext/session/sessionwor.test 67b5ab91d4f93ce65ff1f58240ac5ddf73f8670facc1ffa49cef56293d52818d
  F ext/session/sqlite3session.c a4dfb372f270df93422b0dc7666fd46849e6979b62a152f11287c21eed4ac21b
- F ext/session/sqlite3session.h 919be6649d39d6413ce7a63fc3e3bca3270e18bc2d57ad4040a70007b9e54397
+ F ext/session/sqlite3session.h a2db5b72b938d12c727b4b4ec632254ca493670a9c0de597af3271a7f774fc57
  F ext/session/test_session.c 98797aba475a799376c9a42214f2d1debf2d0c3cb657d9c8bbf4f70bf3fb4aec
 +F ext/sqlrr/README.txt 4239030e73023e72a2e727808cd433577d5bf730
 +F ext/sqlrr/sqlrr.c 8d1e6571cd6a6beabdb5bcdfe3a0e723b914db41
 +F ext/sqlrr/sqlrr.h 09e4f8929ad9bc2638732c0cc0db5eef8c417824
  F ext/userauth/sqlite3userauth.h 7f3ea8c4686db8e40b0a0e7a8e0b00fac13aa7a3
  F ext/userauth/user-auth.txt e6641021a9210364665fe625d067617d03f27b04
  F ext/userauth/userauth.c f81aa5a3ecacf406f170c62a144405858f6f6de51dbdc0920134e629edbe2648
  F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
  F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8
  F magic.txt 8273bf49ba3b0c8559cb2774495390c31fd61c60
- F main.mk 5341a5f706e16ab5a667727a2a0e8d01d0adfec07ae3dbc27ed0356efba311aa
 -F main.mk 7ce055f3df31a4f7d21e38f493f907c21db1f673863a573e231f55e2ab005023
++F main.mk 9830bea3b216623851057514670077a706478d443681fefcbd70d509c4cd4285
  F mkso.sh fd21c06b063bb16a5d25deea1752c2da6ac3ed83
  F mptest/config01.test 3c6adcbc50b991866855f1977ff172eb6d901271
  F mptest/config02.test 4415dfe36c48785f751e16e32c20b077c28ae504
@@@ -469,31 -472,31 +475,31 @@@ F src/auth.c a3d5bfdba83d25abed1013a8c7
  F src/backup.c f70077d40c08b7787bfe934e4d1da8030cb0cc57d46b345fba2294b7d1be23ab
  F src/bitvec.c 17ea48eff8ba979f1f5b04cc484c7bb2be632f33
  F src/btmutex.c 8acc2f464ee76324bf13310df5692a262b801808984c1b79defb2503bbafadb6
- F src/btree.c fe7876b04f31c2f8be6e42443fc64ec37f7392863c0ca67bb002a4ed1aad4927
- F src/btree.h c11446f07ec0e9dc85af8041cb0855c52f5359c8b2a43e47e02a685282504d89
- F src/btreeInt.h d3250a991da485bf4a1b607ad7d7db0c28c1ef9ddf0e716ea60e061c7d6c30b6
- F src/build.c 3f9175078038508aabf6e9e5eb1074363016ce0b38ad742c0cbd46b89c82a3ba
- F src/callback.c 25dda5e1c2334a367b94a64077b1d06b2553369f616261ca6783c48bcb6bda73
 -F src/btree.c 7af5ff0f88ba856c2681f6eeb457590b24f787e994f18cbdb44c2de2d33f757e
++F src/btree.c 87013de9def71fea06e6209ca2d3d42c1de3206437862f36eb34426e8e2fbcfb
+ F src/btree.h 6111552f19ed7a40f029cf4b33badc6fef9880314fffd80a945f0b7f43ab7471
 -F src/btreeInt.h 6794084fad08c9750b45145743c0e3e5c27c94dee89f26dd8df7073314934fd2
++F src/btreeInt.h 498e93dc99e2144f843c9b787b8ab995af10f8a20f42bbf535630e5560970bab
+ F src/build.c bd2f382562b08f14748d54402220be1082c2f8ff8973fad47e45a381c438f9bf
+ F src/callback.c c547d00963ae28100117b4fb1f0f32242109b5804374ee3bfe01138a54da7f76
  F src/complete.c a3634ab1e687055cd002e11b8f43eb75c17da23e
  F src/ctime.c 1b0724e66f95f33b160b1af85caaf9cceb325d22abf39bd24df4f54a73982251
  F src/date.c e1d8ac7102f3f283e63e13867acb0efa33861cf34f0faf4cdbaf9fa7a1eb7041
- F src/dbpage.c 135eb3b5e74f9ef74bde5cec2571192c90c86984fa534c88bf4a055076fa19b7
- F src/dbstat.c c12833de69cb655751487d2c5a59607e36be1c58ba1f4bd536609909ad47b319
- F src/delete.c d08c9e01a2664afd12edcfa3a9c6578517e8ff8735f35509582693adbe0edeaf
- F src/expr.c 18974550063a6a1c8eef69e63d2ad88ceb4395ef139a60cc0d0a28632f41d553
+ F src/dbpage.c 8a01e865bf8bc6d7b1844b4314443a6436c07c3efe1d488ed89e81719047833a
+ F src/dbstat.c 0f55297469d4244ab7df395849e1af98eb5e95816af7c661e7d2d8402dea23da
+ F src/delete.c a5c59b9c0251cf7682bc52af0d64f09b1aefc6781a63592c8f1136f7b73c66e4
+ F src/expr.c 003c59158b33d7f3b198122cb0d1e13c06517cc3932e56b42283eb0e96696d66
  F src/fault.c 460f3e55994363812d9d60844b2a6de88826e007
- F src/fkey.c 6b79f4c2447691aa9ac86e2a6a774b65f3b3dd053d4220a4893051a0de20f82e
- F src/func.c ed33e38cd642058182a31a3f518f2e34f4bbe53aa483335705c153c4d3e50b12
- F src/global.c a1a8d698762ddd9a1543aac26c1e0029b20fcc3fcb56bfa41ec8cea2368f2798
+ F src/fkey.c 92a248ec0fa4ed8ab60c98d9b188ce173aaf218f32e7737ba77deb2a684f9847
+ F src/func.c 259496e4856bd0a3215d16804992f3339f3e8db29f129a5a7285c341488bbe9c
+ F src/global.c 59601d885a0dbbfbd22ed2d030424a5e7f1b9809a17ca46686058bbc4a55e980
  F src/hash.c 8d7dda241d0ebdafb6ffdeda3149a412d7df75102cecfc1021c98d6219823b19
  F src/hash.h 9d56a9079d523b648774c1784b74b89bd93fac7b365210157482e4319a468f38
- F src/hwtime.h 747c1bbe9df21a92e9c50f3bbec1de841dc5e5da
+ F src/hwtime.h cb1d7e3e1ed94b7aa6fde95ae2c2daccc3df826be26fc9ed7fd90d1750ae6144
  F src/in-operator.md 10cd8f4bcd225a32518407c2fb2484089112fd71
- F src/insert.c 40557ebd69f4115e7a273f9304a8ab637a47ce44f3c6923396928f023967b5e8
+ F src/insert.c 5ba8fd376f539240939ae76b5bc9fa7ad9a0d86e9914ecd11eb7002204138c11
 -F src/legacy.c d7874bc885906868cd51e6c2156698f2754f02d9eee1bae2d687323c3ca8e5aa
 +F src/legacy.c f69590f141eabd2dc787710264ccfa4374fac991ea1ca2120a2550c0ffe32afd
- F src/loadext.c 4ddc65ae13c0d93db0ceedc8b14a28c8c260513448b0eb8c5a2ac375e3b6a85d
- F src/main.c 120797eedf241cf18895b1edfdc2da12fdd9a6a7686d70f2eb44861966b13b3e
- F src/malloc.c 0f9da2a66b230a5785af94b9672126845099b57b70a32c987d04ac28c69da990
+ F src/loadext.c 8cd803f1747c03a50b32fe87ebfb5851998d0cdafefe02737daa95e0616b42bb
 -F src/main.c da8b42cee9b83cc923bf23d1945c9fb48cf57cb0422d5fe43a1ff88dc453b97b
++F src/main.c 394d7e69ece3927918f6363cbc5f6ec3a2cd143bfcf68153d5f1bb4835a980bc
+ F src/malloc.c eaa4dc9602ce28b077f7de2eb275db2be270c5cc56d7fec5466301bd9b80e2f5
  F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
  F src/mem1.c c12a42539b1ba105e3707d0e628ad70e611040d8f5e38cf942cee30c867083de
  F src/mem2.c f1940d9e91948dd6a908fbb9ce3835c36b5d83c3
@@@ -508,38 -511,37 +514,38 @@@ F src/mutex_noop.c 9d4309c075ba9cc7249e
  F src/mutex_unix.c aaf9ebc3f89df28483c52208497a99a02cc3650011422fc9d4c57e4392f7fe58
  F src/mutex_w32.c 7670d770c94bbfe8289bec9d7f1394c5a00a57c37f892aab6b6612d085255235
  F src/notify.c 9711a7575036f0d3040ba61bc6e217f13a9888e7
- F src/os.c 49ec7427f86724a17b3f018642c916b1ed732f0b22d4f723ff3f9c15431a615f
 -F src/os.c 669cc3839cc35d20f81faf0be1ab6d4581cea35e9d8f3a9d48a98d6571f7c285
++F src/os.c c862e5d629d7ad8f762b9f67e716809832acffc5bf4105839b363fb2d11d0e73
  F src/os.h 48388821692e87da174ea198bf96b1b2d9d83be5dfc908f673ee21fafbe0d432
  F src/os_common.h b2f4707a603e36811d9b1a13278bffd757857b85
  F src/os_setup.h 0dbaea40a7d36bf311613d31342e0b99e2536586
- F src/os_unix.c 02b588082ae371e6b9f4ec1abee22fd11deb1e9ba29eb281fb962f56badb458c
 -F src/os_unix.c ad7640c04eed946052a3b12856362a773d0a717696707313037186df0e2b59f2
 -F src/os_win.c 035a813cbd17f355bdcad7ab894af214a9c13a1db8aeac902365350b98cd45a7
++F src/os_unix.c a796deff42a187cc7820dc7b2d9d07426196e558e49f40d0f7b0b1f4e3e3ff73
 +F src/os_win.c b393ae2303d051684f4bdaec3984c9c9594f10adc629689108ed9aa5ab219d17
  F src/os_win.h 7b073010f1451abe501be30d12f6bc599824944a
- F src/pager.c 17ac3113571597edc8b75fd4f890851274cd2581759d611c80dd6b19972e3b4e
- F src/pager.h 0acf77fd717a46c304f52405e19a550101a9efda29154af00d34eedcb7f1d50b
- F src/parse.y 50bfcb34be7320dd0cb875021a93ae6451c8f0b083f21b71934a1a3a9108015a
 -F src/pager.c 52a2923ebd6ca0e2ce917b5860ffe893a344481b5fa4c2a2568ad156168bc558
 -F src/pager.h 71fe1d5016ec54d0cc5d344cd474e563450b438c59f535e8c1ec8a13b1373f14
++F src/pager.c a54c544141cee1556a8445af7c2aae335d65a3b0d33066f31c28b441133f25cc
++F src/pager.h 02f34df97a166ee5096560dc00d2acec4d7cf7c63e95ba21cd00ad60fd5d95d3
+ F src/parse.y c8d2de64db469fd56e0fa24da46cd8ec8523eb98626567d2708df371b47fdc3f
  F src/pcache.c 385ff064bca69789d199a98e2169445dc16e4291fa807babd61d4890c3b34177
  F src/pcache.h 4f87acd914cef5016fae3030343540d75f5b85a1877eed1a2a19b9f284248586
- F src/pcache1.c 80e8d7fcf0fa096dbdce55d2b140a711629718020e3cb2008bee424bc4070bce
- F src/pragma.c 2b67263250c99f068114741dd3773a75fc3a04319e5a27713df2f5522a0e6b77
- F src/pragma.h 40962d65b645bb3f08c1f4c456effd01c6e7f073f68ea25177e0c95e181cff75
- F src/prepare.c 83b2038e4706efd8b8b43d0a9cd93fc9df2d7041fefcd3e7aff6cb1aca8c2d9c
 -F src/pcache1.c 6596e10baf3d8f84cc1585d226cf1ab26564a5f5caf85a15757a281ff977d51a
 -F src/pragma.c 9145cc0d7309b49d383fe15deca9ab592830b8b532e7fb25e9e36b6f470cbf66
++F src/pcache1.c 33a0577ec7241397244369aa4874b41970fbad41190847243797a350331cb6d1
++F src/pragma.c a2bc2d320c9d208f38b3b27ce2b9c2e70cc5ee95849de12231f35f4ac6f2bd06
+ F src/pragma.h 9f86a3a3a0099e651189521c8ad03768df598974e7bbdc21c7f9bb6125592fbd
 -F src/prepare.c 6049beb71385f017af6fc320d2c75a4e50b75e280c54232442b785fbb83df057
++F src/prepare.c 852827aab652c9a25c6a599a021e1d24e27321ebde0591e48eac5a5e21585b0b
  F src/printf.c 9be6945837c839ba57837b4bc3af349eba630920fa5532aa518816defe42a7d4
  F src/random.c 80f5d666f23feb3e6665a6ce04c7197212a88384
- F src/resolve.c e021be0c1c4a2125fa38aabcd8dbb764bf5b2c889a948c30d3708430ec6ccd00
+ F src/resolve.c 1139e3157c710c6e6f04fe726f4e0d8bdb1ae89a276d3b0ca4975af163141c9c
  F src/rowset.c d977b011993aaea002cab3e0bb2ce50cf346000dff94e944d547b989f4b1fe93
- F src/select.c b3d64a7a3342471ce078251c5ba132f8ec66f994534f1070dda025b354a09a62
- F src/shell.c.in d70bcf630c4073eaa994fa74be98886c781918e794cb8b562be8df10f018e274
- F src/sqlite.h.in c16500202fdfe9c4400e18377f84488c0c56b7b5537f036915b1a556b96aa8ab
+ F src/select.c 924b61cef57033a8ca1ed3dcffd02445a7dd0c837cc849b2e4117251cac831f5
+ F src/shell.c.in 1b2a636ba5b676f844a2af2a5f719b5c4ace7c6825d56270e2ae912b2a5fc840
 -F src/sqlite.h.in cedb3737511a45ae35fba6e4d6c250ae36f6b82da0de38113efa1a3bc83ee105
++F src/sqlite.h.in 34711888550dcd8bca400621d17e6f1177dfea0cbfd35d026dfbc63aadf33eda
  F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
- F src/sqlite3ext.h cef696ce3293242c67b2339763608427bf72ee66f1f3a05389ac2a7b46001c31
- F src/sqliteInt.h 4d5c6d23ea78c0ad38a91322036f08b11fcc83be45c78adee0db912b3e21c68c
 +F src/sqlite3_private.h aee73ebaea1963e528b61408c01ba82f49fdf3dca9cbe940f3b0f3d9cec25942
 -F src/sqliteInt.h 7a29ba700a51eeb925731749a570cf3859f6a58ed94797ecf47508875b0ba279
+ F src/sqlite3ext.h b0f776a0d042b23b6bcbb6b0943e8a3768c7f0b438a275e7168f0204e223a4db
++F src/sqliteInt.h 7fbd095709d25a70e6ff5f31e422f21b34001f91a74dde43ba01ad577c0adfe9
  F src/sqliteLimit.h 1513bfb7b20378aa0041e7022d04acb73525de35b80b252f1b83fedb4de6a76b
- F src/status.c 46e7aec11f79dad50965a5ca5fa9de009f7d6bde08be2156f1538a0a296d4d0e
+ F src/status.c 9ff2210207c6c3b4d9631a8241a7d45ab1b26a0e9c84cb07a9b5ce2de9a3b278
  F src/table.c b46ad567748f24a326d9de40e5b9659f96ffff34
- F src/tclsqlite.c 50c93be3e1c03b4e6cf6756e5197afcfe7f5cd0497d83a7ac317cde09e19b290
- F src/test1.c 5a199289e5d5a795f375db50223de1f9a2f7c3927de5c0c88a19f5134da8d56d
+ F src/tclsqlite.c f2dae14bfe7a35c94b6d515df88071014678ec39dafebdcf8e6bde91d62516c1
 -F src/test1.c 4d0ab2f67053a4fff87d1d3586ecc0e5322a1fc45dd4119ab11dc96de44f17a1
++F src/test1.c 8157589a22f1be5eadb8e5218a0ab2e98716822098532ac2368c470fb8d6fc79
  F src/test2.c 3efb99ab7f1fc8d154933e02ae1378bac9637da5
  F src/test3.c 61798bb0d38b915067a8c8e03f5a534b431181f802659a6616f9b4ff7d872644
  F src/test4.c 405834f6a93ec395cc4c9bb8ecebf7c3d8079e7ca16ae65e82d01afd229694bb
@@@ -593,34 -595,34 +599,34 @@@ F src/test_windirent.h 90dfbe95442c9762
  F src/test_window.c cdae419fdcea5bad6dcd9368c685abdad6deb59e9fc8b84b153de513d394ba3f
  F src/test_wsd.c 41cadfd9d97fe8e3e4e44f61a4a8ccd6f7ca8fe9
  F src/threads.c 4ae07fa022a3dc7c5beb373cf744a85d3c5c6c3c
- F src/tokenize.c d3615f0cbe4db5949503bf5916f3cd4fa5de855d5b4ef560f3b6dd5629423a1e
- F src/treeview.c fddeb413159c3eeeaea3f496172f121cf3695606c461dc4e6dcee51417952df5
- F src/trigger.c 845ccc08f60716c58aa28fe6470385c18ef8c4e1d88c93dcf449bc13d464eb2e
- F src/update.c 7f05fad5e145248a00048aeb0bac78b8fdb4ed17216e14a6eb24c55596e87ee7
- F src/upsert.c 710c91bb13e3c3fed5b6fe17cb13e09560bdd003ad8b8c51e6b16c80cfc48b10
- F src/utf.c 2f0fac345c7660d5c5bd3df9e9d8d33d4c27f366bcfb09e07443064d751a0507
- F src/util.c fffdfa627be74d69ef425f92db124e7148af449bb8a3286e79577c42bca84061
+ F src/tokenize.c 7b17f6e2f20f6cbcb0b215025a86b7457c38451fc7622f705e553d7a488c572d
+ F src/treeview.c 438c1000587b33faba35e87596bebcf7f40638d98f33781cdd9e04711b18b09c
+ F src/trigger.c a40d50e88bd3355f1d2a73f0a3b2d6b42eae26ca4219001b82ef0d064439badc
+ F src/update.c 9ad19af96aff95dc02a923a99f97c1bc0b909009a29a2914b796f786b9ac0c60
+ F src/upsert.c 2920de71b20f04fe25eb00b655d086f0ba60ea133c59d7fa3325c49838818e78
+ F src/utf.c 736ff76753236ffbc8b5b939f5e0607f28aeaa7c780b3a56b419228f0a81c87b
+ F src/util.c e5f3971160154e5c9b660fd119b02ec4890e87cd18a5bc4d45ee60cddbb9e6a2
  F src/vacuum.c 82dcec9e7b1afa980288718ad11bc499651c722d7b9f32933c4d694d91cb6ebf
- F src/vdbe.c da91e9d340bbb46b6717e86c208078c02e88558f1abe4f7723806dadec3ed6c5
- F src/vdbe.h 3f2b571e702e77e6bf031f0236e554aedfae643e991f69000320f481408455cf
- F src/vdbeInt.h e95de5129124d77f01439e6635012adfaf23c0017bff47296126143cf18bd0c6
- F src/vdbeapi.c 8a3b164874aeea34e6fbfbc76d0bdae4bde6f0400b23b762a13f0d415dde77a0
- F src/vdbeaux.c d17dfbf1e03ef706cad9e2076c7f2354882c191a84e73e00c69c50bb7823e5ce
 -F src/vdbe.c 35dcc7d43c2635853773d994b052061283a4e5b0e60e799cef83e410d90f3145
++F src/vdbe.c bb6cc5fb76c25369c88b1c4e152bedefa182ddf0d0ac71fdaa53872998add38e
+ F src/vdbe.h defd693289c7bb8d325f109be9490c77138061211a116827da7244b6015a4934
+ F src/vdbeInt.h 30d3e8b991547cdf39025e416a0a737b0416d46747af70ae058f60e2e0466fe7
 -F src/vdbeapi.c 1252d80c548711e47a6d84dae88ed4e95d3fbb4e7bd0eaa1347299af7efddf02
++F src/vdbeapi.c 0ae0004c43d54219d1446c04c6bdd91fa2f50de9ddf9612f05b76ecf735c5c66
+ F src/vdbeaux.c ff690e6c9314ef281de7c06f8c8c33393f0afca80aabb1fe69836dcf2d60b0bf
  F src/vdbeblob.c 253ed82894924c362a7fa3079551d3554cd1cdace39aa833da77d3bc67e7c1b1
- F src/vdbemem.c d8e10d1773806105e62094c4ede0a4684f46caaf07667a45e6d461e94306b530
- F src/vdbesort.c da75f505aba230060ce6472605a4aa6494f73eeb1071e1cc2643c3d4035e671b
+ F src/vdbemem.c ad9e6217635f2b04df98bc57b12c98cefc9c0a1745cca47f4e8109119213253d
+ F src/vdbesort.c a3be032cc3fee0e3af31773af4a7a6f931b7230a34f53282ccf1d9a2a72343be
  F src/vdbetrace.c fa3bf238002f0bbbdfb66cc8afb0cea284ff9f148d6439bc1f6f2b4c3b7143f0
- F src/vtab.c 5a0b7193d586991b3db30e343d6b59959906bfe8658a6a0a85709b20ca50bb49
+ F src/vtab.c 7b704a90515a239c6cdba6a66b1bb3a385e62326cceb5ecb05ec7a091d6b8515
  F src/vxworks.h d2988f4e5a61a4dfe82c6524dd3d6e4f2ce3cdb9
- F src/wal.c 8b2cb7bc3c379d38b4243614f803e894831fbb19a6a2c4e589792f0ed6fe7f5b
 -F src/wal.c 15a2845769f51ba132f9cf0b2c7a6887a91fc8437892dbcce9fcdc68b66d60a1
 -F src/wal.h 606292549f5a7be50b6227bd685fa76e3a4affad71bb8ac5ce4cb5c79f6a176a
++F src/wal.c 48ace3d10f878f4ae0877c03c71e23050e47e5d00707c38d8c131fd56c8027fe
 +F src/wal.h bc4bdd9ee970c9d62197fa4139d7782f4d96d75152d1e6d4ead4d45dd684187d
- F src/walker.c d5a94907dcac990e31976be9dc769d17f6a806782593d6aec9d760ee01ec22cd
- F src/where.c 9f3f23efc45934e7b7ea6c0c1042420b73053e7c3264feef6faf9ce6fbd5df61
- F src/whereInt.h 2c6bae136a7c0be6ff75dc36950d1968c67d005c8e51d7a9d77cb996bb4843d9
- F src/wherecode.c 535c8e228478fd971b9a5b6cb6773995b0fbf7020d5989508a5094ce5b8cd95b
- F src/whereexpr.c 05c283d26aa9c3f5d1bf13a5f6a573b43295b9db280eff18e26f97d7d7f119b4
- F src/window.c 064f251451c8e2a1c76b6269229d911a651e119c6a5f522b6eaebf8dc8714041
+ F src/walker.c a137468bf36c92e64d2275caa80c83902e3a0fc59273591b96c6416d3253d05d
+ F src/where.c df2bea0e0122e853d9f1a8ec68920744166d2a524e338eba92e5470538ecd1f9
+ F src/whereInt.h e1d1db6bbec0ba4f345acc338f956c8237a6f06413afa68c6414e82fb5b06745
+ F src/wherecode.c ec8870d6fe79668dd12d7edc65ae9771828d6cdfe478348c8abd872a89fdbadd
+ F src/whereexpr.c 4b34be1434183e7bb8a05d4bf42bd53ea53021b0b060936fbd12062b4ff6b396
+ F src/window.c f8ba2ee12a19b51d3ba42c16277c74185ee9215306bc0d5a03974ade8b5bc98f
 -F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2
 +F test/8_3_names.test 05034aadccd2253ffe6cbefb06662b8aa4600f77
  F test/affinity2.test ce1aafc86e110685b324e9a763eab4f2a73f737842ec3b687bd965867de90627
  F test/affinity3.test 6a101af2fc945ce2912f6fe54dd646018551710d
  F test/aggerror.test a867e273ef9e3d7919f03ef4f0e8c0d2767944f2
@@@ -637,9 -639,9 +643,9 @@@ F test/altercol.test 1d6a6fe698b81e626b
  F test/alterlegacy.test 82022721ce0de29cedc9a7af63bc9fcc078b0ee000f8283b4b6ea9c3eab2f44b
  F test/altermalloc.test 167a47de41b5c638f5f5c6efb59784002b196fff70f98d9b4ed3cd74a3fb80c9
  F test/altermalloc2.test fa7b1c1139ea39b8dec407cf1feb032ca8e0076bd429574969b619175ad0174b
- F test/altertab.test 8069e5a8cbd3cb35732d3ec680dcc5273c2587ebd8e6a5d51084fa8059e468e5
- F test/altertab2.test 8883693952f6d7fb5f754dbf1d694ed780aa883027bef04cb1fb99a3b88c9272
- F test/altertab3.test c755ef31f8a61911331b46d71e43f6f3ef94af05c56314b168e47520355fa18e
 -F test/altertab.test bd61e5b73d495ec4707133db91b07f09d57e339d988de5ec5a76d34a2198e8f2
++F test/altertab.test 8f94e669eaec506169630defa7939bbd32334b9d75bb5cd1efc37a00cf1f6318
+ F test/altertab2.test b0d62f323ca5dab42b0bc028c52e310ebdd13e655e8fac070fe622bad7852c2b
+ F test/altertab3.test 155b8dc225ce484454a7fb4c8ba745680b6fa0fc3e08919cbbc19f9309d128ff
  F test/amatch1.test b5ae7065f042b7f4c1c922933f4700add50cdb9f
  F test/analyze.test 547bb700f903107b38611b014ca645d6b5bb819f5210d7bf39c40802aafeb7d7
  F test/analyze3.test 01f0b122e3e54ad2544f14f7cc7dcb4c2cb8753cad5e88c6b8d49615b3fd6a2b
@@@ -663,10 -665,10 +669,10 @@@ F test/atof1.test 1ccfc96a6888566597b83
  F test/atomic.test 065a453dde33c77ff586d91ccaa6ed419829d492dbb1a5694b8a09f3f9d7d061
  F test/atomic2.test b6863b4aa552543874f80b42fb3063f1c8c2e3d8e56b6562f00a3cc347b5c1da
  F test/atrc.c ec92d56d8fbed9eb3e11aaf1ab98cf7dd59e69dae31f128013f1d97e54e7dfed
 -F test/attach.test 21bce8681f780a8d631a5ec7ecd0d849bfe84611257b038ae4ffeccc609d8a4e
 +F test/attach.test 5f20de6f9a50ef59ac66d70cb8d76c2ccca46ce4334dc821ae4e16c53093234a
  F test/attach2.test 256bd240da1835fb8408dd59fb7ef71f8358c7a756c46662434d11d07ba3a0ce
  F test/attach3.test c59d92791070c59272e00183b7353eeb94915976
- F test/attach4.test faaaf33fa51f986b414520cb03cecdc7999df108
 -F test/attach4.test aa05b1d8218b24eba5a7cccf4f224f514ba57ba705c9267f09d2bb63fed0eea1
++F test/attach4.test 392e04bb6ff4c2998f88049da3a2e410554abc964c2ee3d9eb0c3bb8e1f48758
  F test/attachmalloc.test 12c4f028e570acf9e0a4b0b7fe6f536e21f3d5ebddcece423603d0569beaf438
  F test/auth.test 2154625c05bc79f0e0ea72cb2358395a8041243caa0fd7ce7617d50da4331794
  F test/auth2.test 9eb7fce9f34bf1f50d3f366fb3e606be5a2000a1
@@@ -852,7 -854,7 +858,7 @@@ F test/enc4.test c8f1ce3618508fd0909945
  F test/eqp.test 84879b63e3110552bf8ce648a3507dc3ceb72109ecec83c2aef0db37a27f6382
  F test/errmsg.test eae9f091eb39ce7e20305de45d8e5d115b68fa856fba4ea6757b6ca3705ff7f9
  F test/eval.test a64c9105d6ff163df7cf09d6ac29cdad5922078c
- F test/exclusive.test e6b1f19261732fb0c32401393917b640d3b4e7df397f72ceff201d6548907f47
 -F test/exclusive.test d6ccc6acc5d660544f8e0cacaec2c620f8ebb42a764d783ab53430e26057a185
++F test/exclusive.test 23484cc4ef52e8930c33934440e027da7bc894d3826476da85ffd362fbbfbcf9
  F test/exclusive2.test 984090e8e9d1b331d2e8111daf6e5d61dda0bef7
  F test/exec.test e949714dc127eaa5ecc7d723efec1ec27118fdd7
  F test/exists.test 79a75323c78f02bbe9c251ea502a092f9ef63dac
@@@ -860,10 -862,10 +866,10 @@@ F test/expr.test 26cd01e8485bc48c8aa6a1
  F test/expr2.test c27327ae9c017a7ff6280123f67aff496f912da74d78c888926d68b46ec75fd8
  F test/extension01.test 00d13cec817f331a687a243e0e5a2d87b0e358c9
  F test/extraquick.test cb254400bd42bfb777ff675356aabf3287978f79
 -F test/fallocate.test 37a62e396a68eeede8f8d2ecf23573a80faceb630788d314d0a073d862616717
 +F test/fallocate.test 9151a4a8912fe0d873c4e02cd52bdd6b2d6eb8b57a69f42b27972c1ded4775c8
  F test/filectrl.test 6e871c2d35dead1d9a88e176e8d2ca094fec6bb3
  F test/filefmt.test f393e80c4b8d493b7a7f8f3809a8425bbf4292af1f5140f01cb1427798a2bbd4
- F test/filter1.test edd797ab2ef38de16064c9e3945efd941cba72d27e8f070c349501ff95d2727d
 -F test/filter1.test 8a6f047a000ef391db2ca17b6beecc0006f4e0f9ca8bbe272b2443c7316e66b1
++F test/filter1.test a348b35fceb44c17093974f429736e735564231785e2bd962ef4d889f3740810
  F test/filter2.tcl 44e525497ce07382915f01bd29ffd0fa49dab3adb87253b5e5103ba8f93393e8
  F test/filter2.test 485cf95d1f6d6ceee5632201ca52a71868599836f430cdee42e5f7f14666e30a
  F test/filterfault.test c08fb491d698e8df6c122c98f7db1c65ffcfcad2c1ab0e07fa8a5be1b34eaa8b
@@@ -1085,15 -1088,15 +1092,15 @@@ F test/ioerr4.test f130fe9e71008577b342
  F test/ioerr5.test 2edfa4fb0f896f733071303b42224df8bedd9da4
  F test/ioerr6.test a395a6ab144b26a9e3e21059a1ab6a7149cca65b
  F test/istrue.test 75327829744e65cc8700e69340b8e6c192e10e39dfae7ccb0e970d3c4f49090a
- F test/join.test 7610c1818f8921618279ab633fc03c93d54f6c8fb9e9e7e96b252319ece346d4
- F test/join2.test 10f7047e723ebd68b2f47189be8eed20451a6f665d8bf46f1774c640d1062417
 -F test/join.test 0e8d3f4092897c717abcaf64e2e7b298e1cb143e2436010c57cfed5596bf6d30
++F test/join.test 413ffda0d51f98583aacf36b41764b1d87f754bfdee2dd88e5821fd126ccaf55
+ F test/join2.test 659bc6193f5c3fe20fa444dd2c91713db8c33e376b098b860644e175e87b8dbc
  F test/join3.test 6f0c774ff1ba0489e6c88a3e77b9d3528fb4fda0
  F test/join4.test 1a352e4e267114444c29266ce79e941af5885916
  F test/join5.test 3a96dc62f0b45402d7207e22d1993fe0c2fce1c57644a11439891dd62b990eb7
  F test/join6.test cfe6503791ceb0cbb509966740286ec423cbf10b
  F test/journal1.test c7b768041b7f494471531e17abc2f4f5ebf9e5096984f43ed17c4eb80ba34497
  F test/journal2.test 9dac6b4ba0ca79c3b21446bbae993a462c2397c4
- F test/journal3.test 9b00ec2574b373c09b41381b43605617199edfd706d332ea8b3124e5917932eb
 -F test/journal3.test 7c3cf23ffc77db06601c1fcfc9743de8441cb77db9d1aa931863d94f5ffa140e
++F test/journal3.test 577e865befd0476f7497ccca9969ed301da3fe0fbea3ec5ed7816f1318d34a52
  F test/jrnlmode.test 9b5bc01dac22223cb60ec2d5f97acf568d73820794386de5634dcadbea9e1946
  F test/jrnlmode2.test 8759a1d4657c064637f8b079592651530db738419e1d649c6df7048cd724363d
  F test/jrnlmode3.test 556b447a05be0e0963f4311e95ab1632b11c9eaa
@@@ -1147,17 -1150,17 +1155,17 @@@ F test/mallocJ.test b5d1839da331d96223e
  F test/mallocK.test 1f4b5efbf61715ab79b20b38739ff4b3d110ceb53f54e5db6da1f01c083707ab
  F test/mallocL.test fb311ff80afddf3b1a75e52289081f4754d901dc
  F test/mallocM.test 78bbe9d3da84a5c679123cdb40d7b2010b18fc46e13897e4f253c6ba6fbff134
 -F test/malloc_common.tcl aac62499b76be719fac31e7a3e54a7fd53272e7f
 +F test/malloc_common.tcl 8d368ee0b9d77c9643b174448f137c18b68e49f4
  F test/malloctraceviewer.tcl b7a54595270c1d201abf1c3f3d461f27eaf24cdef623ad08a0fe5e411264c8a9
 -F test/manydb.test 28385ae2087967aa05c38624cec7d96ec74feb3e
 +F test/manydb.test 3cd8e52ab3112cb8365afeedd6e8231977920577
  F test/mem5.test c6460fba403c5703141348cd90de1c294188c68f
 -F test/memdb.test c1f2a343ad14398d5d6debda6ea33e80d0dafcc7
 +F test/memdb.test c46019291625650d71416e770f6a54a281a1a98f
  F test/memdb1.test 58d92c2bf622cc5f0f41461e1b35cf64f3f787199544c2c1dada37d88753f9d4
  F test/memleak.test 10b9c6c57e19fc68c32941495e9ba1c50123f6e2
 -F test/memsubsys1.test 9e7555a22173b8f1c96c281ce289b338fcba2abe8b157f8798ca195bbf1d347e
 +F test/memsubsys1.test 21f6e0e93302665caa03f37bf832afa1e8dde768d3f5547a5c59a03655d3bfaa
  F test/memsubsys2.test 3e4a8d0c05fd3e5fa92017c64666730a520c7e08
  F test/minmax.test 6751e87b409fe11b02e70a306d846fa544e25a41
- F test/minmax2.test dae92964ac87c1d2ef978c582e81a95e11c00f1cbef68980bfb2abaf10315063
+ F test/minmax2.test 1edf66901ddfab26ae1e04165e8da834c8d3284e2b20aefb26b80ef217962eab
  F test/minmax3.test cc1e8b010136db0d01a6f2a29ba5a9f321034354
  F test/minmax4.test 272ca395257f05937dc96441c9dde4bc9fbf116a8d4fa02baeb0d13d50e36c87
  F test/misc1.test 7ce84b25df9872e7d7878613a96815d2ba5bc974ac4e15a50118dde8f3917599
@@@ -1210,10 -1213,10 +1218,10 @@@ F test/orderby8.test 23ef1a5d72bd3adcc2
  F test/orderby9.test 87fb9548debcc2cd141c5299002dd94672fa76a3
  F test/orderbyA.test df608e59efc2ef50c1eddf1a773b272de3252e9401bfec86d04b52fd973866d5
  F test/oserror.test 1fc9746b83d778e70d115049747ba19c7fba154afce7cc165b09feb6ca6abbc5
- F test/ossfuzz.c 18af635fa73d12a109b305faca727a734c1fa28a421b161d9d15c5a84a4998a2
+ F test/ossfuzz.c 9636dad2092a05a32110df0ca06713038dd0c43dd89a77dabe4b8b0d71096715
  F test/ossshell.c f125c5bd16e537a2549aa579b328dd1c59905e7ab1338dfc210e755bb7b69f17
  F test/ovfl.test 199c482696defceacee8c8e0e0ef36da62726b2f
 -F test/pager1.test 1e9ee778bdeaf4f7f09997d029cdaca6a42dfc2092edafe4f5e590acbf1eab13
 +F test/pager1.test a309660a312ca241053c2b1253d432f868cfe64f25aac17f8e7572099b279e5c
  F test/pager2.test 67b8f40ae98112bcdba1f2b2d03ea83266418c71
  F test/pager3.test 4e9a83d6ca0838d7c602c9eb93d1357562d9059c1e02ffb138a8271020838370
  F test/pager4.test a122e9e6925d5b23b31e3dfef8c6a44bbf19590e
@@@ -1228,11 -1231,11 +1236,11 @@@ F test/pcache2.test af7f3deb1a819f77a6d
  F test/percentile.test 4243af26b8f3f4555abe166f723715a1f74c77ff
  F test/permutations.test 8587800fe1a0eb01456a3f4500b821e54e3347e78acf11dbf05f4990530f6cee
  F test/pg_common.tcl 222a1bad1c41c308fa366313cd7b51b3be7e9b21c8736a421b974ac941693b54
 -F test/pragma.test 59becdfd720b80d463ab750f69f7118fde10dfd556aa5d554f3bf6b7e5ea7533
 +F test/pragma.test 5e6cbd81e86b150312bbec11390b0c9066403545ad2e9cc9f53bf63b083e3882
  F test/pragma2.test e5d5c176360c321344249354c0c16aec46214c9f
- F test/pragma3.test 8300aa9c63cff1027006ca34bf413a148abbd6dcd471fa9a1ded322fe18c0df9
- F test/pragma4.test 5500c386d765864831a81c795793e31b6c58c4b6e0928c719c42b8b49f9fa80e
- F test/pragma5.test 2be6a44c91e8585ccb4c71c5f221ccebe0692a49557215a912916ed391188959
+ F test/pragma3.test 92a46bbea12322dd94a404f49edcfbfc913a2c98115f0d030a7459bb4712ef31
 -F test/pragma4.test 10c624e45a83c0096a82a7579a5ff658542391d3b77355192da6572c8c17c00b
++F test/pragma4.test 49ee189899bc6bcf7e93e47b372a76ae567fb95905a84b5fc0ddcc4128b585ad
+ F test/pragma5.test 7b33fc43e2e41abf17f35fb73f71b49671a380ea92a6c94b6ce530a25f8d9102
  F test/pragmafault.test 275edaf3161771d37de60e5c2b412627ac94cef11739236bec12ed1258b240f8
  F test/prefixes.test b524a1c44bffec225b9aec98bd728480352aa8532ac4c15771fb85e8beef65d9
  F test/printf.test 0300699733e53101b2ce48800518427249edd4053bb50fa0621c6607482f0fdb
@@@ -1262,10 -1265,10 +1270,10 @@@ F test/rollback.test 06680159bc6746d0f2
  F test/rollback2.test bc868d57899dc6972e2b4483faae0e03365a0556941474eec487ae21d8d38bb6
  F test/rollbackfault.test 0e646aeab8840c399cfbfa43daab46fd609cf04a
  F test/round1.test 768018b04522ca420b1aba8a24bd76091d269f3bce3902af3ec6ebcee41ab21e
 -F test/rowallock.test 3f88ec6819489d0b2341c7a7528ae17c053ab7cc
 +F test/rowallock.test e8c576ebc92f6b9211662f495658fd39bbcacb5b
  F test/rowhash.test 0bc1d31415e4575d10cacf31e1a66b5cc0f8be81
  F test/rowid.test bfbd7b97d9267660be3c8f28507c4ed7f205196b8877c0db42df347c2e8845e3
- F test/rowvalue.test a3e729d5c1f32da03bba15af1e3128218d2ba3c40d4f4ed5fa0497a713df68ea
+ F test/rowvalue.test 8964f95b253d3b5cc8dc1cfd0cdb7529bce3ecc6b6259e23c5f829f80f4d51cd
  F test/rowvalue2.test 060d238b7e5639a7c5630cb5e63e311b44efef2b
  F test/rowvalue3.test 3068f508753af69884b12125995f023da0dbb256
  F test/rowvalue4.test 02e35f7762371c2f57ebd856aa056eac56cb27ef7715a0bb31eac1895a745356
@@@ -1337,9 -1341,9 +1346,9 @@@ F test/shell8.test 96be02ea0c21f05b24c1
  F test/shmlock.test 3dbf017d34ab0c60abe6a44e447d3552154bd0c87b41eaf5ceacd408dd13fda5
  F test/shortread1.test bb591ef20f0fd9ed26d0d12e80eee6d7ac8897a3
  F test/show_speedtest1_rtree.tcl 32e6c5f073d7426148a6936a0408f4b5b169aba5
 -F test/shrink.test 1b4330b1fd9e818c04726d45cb28db73087535ce
 +F test/shrink.test 09bc6e2473321e7a4711ae7d753865daffc42f4a
  F test/sidedelete.test f0ad71abe6233e3b153100f3b8d679b19a488329
- F test/skipscan1.test 2a64ca7b3e6246bb86b47c9051bfd324603b1b60675fe606513535267713e080
+ F test/skipscan1.test ed524bc86f27646b3a297f45d6557b55db338977b6838f8064b196b35848b31b
  F test/skipscan2.test 3eb703ce794f139e7b83567911046298bcde29606116727f9b700ce34f559d2d
  F test/skipscan3.test ec5bab3f81c7038b43450e7b3062e04a198bdbb5
  F test/skipscan5.test 67817a4b6857c47e0e33ba3e506da6f23ef68de2
@@@ -1375,9 -1379,9 +1384,9 @@@ F test/spellfix4.test 51c7c26514ade1698
  F test/sqldiff1.test 28cd737cf1b0078b1ec1bbf425e674c47785835e
  F test/sqllimits1.test 264f4b0f941800ba139d25e33ee919c5d95fea06dfbe8ac291d6811a30984ca5
  F test/sqllog.test 6af6cb0b09f4e44e1917e06ce85be7670302517a
- F test/stat.test f8f1279ffffabe6df825723af18cc6e0ae70a893
+ F test/stat.test 423257dc36e5865fb9dd1d9051ac985763b6fba1daec134932f37772d5ed1e64
  F test/statfault.test f525a7bf633e50afd027700e9a486090684b1ac1
 -F test/stmt.test 54ed2cc0764bf3e48a058331813c3dbd19fc1d0827c3d8369914a5d8f564ec75
 +F test/stmt.test 96bf5c903079f6966498428c953e13dd0192add53230de87a52c59bd505d060a
  F test/stmtvtab1.test 6873dfb24f8e79cbb5b799b95c2e4349060eb7a3b811982749a84b359468e2d5
  F test/subjournal.test 8d4e2572c0ee9a15549f0d8e40863161295107e52f07a3e8012a2e1fdd093c49
  F test/subquery.test d7268d193dd33d5505df965399d3a594e76ae13f
@@@ -1399,15 -1404,15 +1409,15 @@@ F test/tabfunc01.test 5ca6d004157a3e886
  F test/table.test eb3463b7add9f16a5bb836badf118cf391b809d09fdccd1f79684600d07ec132
  F test/tableapi.test ecbcc29c4ab62c1912c3717c48ea5c5e59f7d64e4a91034e6148bd2b82f177f4
  F test/tableopts.test dba698ba97251017b7c80d738c198d39ab747930
- F test/tclsqlite.test f9acb83122be0a7c4997ab7f17742507874dced95144c20217c2428553f110bb
+ F test/tclsqlite.test 6f8705d09377e2f2ff482ab181a1388773953a280623fff2ccab0e87d2bc10a2
 -F test/tempdb.test 4cdaa23ddd8acb4d79cbb1b68ccdfd09b0537aaba909ca69a876157c2a2cbd08
 +F test/tempdb.test 8d0c2ee1cc2286629ca1d7e4e470a8ecf3951b65fb93c6bb7e27fee8ed9f8055
  F test/tempdb2.test 353864e96fd3ae2f70773d0ffbf8b1fe48589b02c2ec05013b540879410c3440
  F test/tempfault.test 0c0d349c9a99bf5f374655742577f8712c647900
  F test/temptable.test d2c9b87a54147161bcd1822e30c1d1cd891e5b30
  F test/temptable2.test d2940417496e2b9548e01d09990763fbe88c316504033256d51493e1f1a5ce6a
  F test/temptable3.test d11a0974e52b347e45ee54ef1923c91ed91e4637
  F test/temptrigger.test 38f0ca479b1822d3117069e014daabcaacefffcc
- F test/tester.tcl 08e60d34f5bbcd871b04e434e52a4e5ee81e98475e49af9acf48d9cd8c72068a
 -F test/tester.tcl abba168acd7f01dbfa3ffdbf402d151eb97e8a824d9208e845ab34c194441483
++F test/tester.tcl 915a24abff784d7fbc981cca8ec0e060981d8ae7d9d56c130194a9f581e8798c
  F test/thread001.test b61a29dd87cf669f5f6ac96124a7c97d71b0c80d9012746072055877055cf9ef
  F test/thread002.test e630504f8a06c00bf8bbe68528774dd96aeb2e58
  F test/thread003.test ee4c9efc3b86a6a2767516a37bd64251272560a7
@@@ -1422,13 -1427,13 +1432,13 @@@ F test/threadtest3.c 38a612ea62854349ed
  F test/threadtest4.c c1e67136ceb6c7ec8184e56ac61db28f96bd2925
  F test/time-wordcount.sh 8e0b0f8109367827ad5d58f5cc849705731e4b90
  F test/tkt-02a8e81d44.test 6c80d9c7514e2a42d4918bf87bf6bc54f379110c
- F test/tkt-18458b1a.test c543c4b8e8c7c2200579a635e72c15bc374a92d44eddb1d588d4fdeca9cca532
+ F test/tkt-18458b1a.test 6a62cb1ee50fa3c620da59e3a6f531eb38fceaf7e2166203816b724524e6f1d6
  F test/tkt-26ff0c2d1e.test c15bec890c4d226c0da2f35ff30f9e84c169cfef90e73a8cb5cec11d723dfa96
  F test/tkt-2a5629202f.test 0521bd25658428baa26665aa53ffed9367d33af2
 -F test/tkt-2d1a5c67d.test be1326f3061caec85085f4c9ee4490561ca037c0
 +F test/tkt-2d1a5c67d.test 58a56653795d1787f4ed661f9da7da153b0dc3f9
  F test/tkt-2ea2425d34.test 1cf13e6f75d149b3209a0cb32927a82d3d79fb28
  F test/tkt-31338dca7e.test 6fb8807851964da0d24e942f2e19c7c705b9fb58
 -F test/tkt-313723c356.test 4b306ad45c736cedf2f5221f6155b92143244b6d
 +F test/tkt-313723c356.test d78f772dd71d632f3d3f6d3d588c3105b2ab1bb3
  F test/tkt-385a5b56b9.test 5204a7cba0e28c99df0acbf95af5e1af4d32965a7a14de6eccebf949607618b1
  F test/tkt-38cb5df375.test f3cc8671f1eb604d4ae9cf886ed4366bec656678
  F test/tkt-3998683a16.test 6d1d04d551ed1704eb3396ca87bb9ccc8c5c1eb7
@@@ -1646,41 -1652,41 +1657,41 @@@ F test/vtab_alter.test 736e66fb5ec7b4fe
  F test/vtab_err.test dcc8b7b9cb67522b3fe7a272c73856829dae4ab7fdb30399aea1b6981bda2b65
  F test/vtab_shared.test 5253bff2355a9a3f014c15337da7e177ab0ef8ad
  F test/vtabdrop.test 65d4cf6722972e5499bdaf0c0d70ee3b8133944a4e4bc31862563f32a7edca12
 -F test/wal.test cdf0ca6cc0447520d19ef1c83287824ebeb3e82d75af856511ba96841a79fc9b
 -F test/wal2.test 537f59e5c5932e3b45bf3591ae3e48a2601360c2e52821b633e222fe6ebd5b09
 -F test/wal3.test 2a93004bc0fb2b5c29888964024695bade278ab2
 -F test/wal4.test 4744e155cd6299c6bd99d3eab1c82f77db9cdb3c
 -F test/wal5.test 9c11da7aeccd83a46d79a556ad11a18d3cb15aa9
 -F test/wal6.test b602704e4b066199bc89d91ca9000f335dcf4572
 +F test/wal.test 0d42851f79b13ffda2b218fa9a237ad287c1642029a89c6517bf857e9d494926
 +F test/wal2.test cf6a3136845023fed62a07b7dfc433d515d7b453bde1bef71fc823867740d945
 +F test/wal3.test 82f70ca79e5db6829f9246f4a30d4a4751921c3b
 +F test/wal4.test 5755887f321baa4c55de0b91066fa7d0cafcac9d
 +F test/wal5.test 9304fada875d7279deb2783385b0ae1c02d96b88
 +F test/wal6.test 3d9b79194d15f5b4f6e4169f89f815c049edb2df
  F test/wal64k.test 2a525c0f45d709bae3765c71045ccec5df7d100ccbd3a7860fdba46c9addb965
 -F test/wal7.test 2ae8f427d240099cc4b2dfef63cff44e2a68a1bd
 -F test/wal8.test d9df3fba4caad5854ed69ed673c68482514203c8
 +F test/wal7.test 18cf68ab8010ae0a2baaa48e5b59567a9503e63e
 +F test/wal8.test 82bf6e493002b2d1580823b40e47bce3e15f468a
  F test/wal9.test 378e76a9ad09cd9bee06c172ad3547b0129a6750
 -F test/wal_common.tcl a98f17fba96206122eff624db0ab13ec377be4fe
 -F test/walbak.test 018d4e5a3d45c6298d11b99f09a8ef6876527946
 -F test/walbig.test f437473a16cfb314867c6b5d1dbcd519e73e3434
 +F test/wal_common.tcl 15f152fd55703975878741beca6cfa4209d5b3b3
 +F test/walbak.test e322af729156c121183af4847c6e2b17bc629f47
 +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/walcksum.test add42a54d7c7d9bc72a913792022a195293bef2b
 +F test/walcrash.test 065a041da88f980df3830f09b7fe308337bb594a
 +F test/walcrash2.test 6eb6842d34cc5955726264c80566963c32a9cbea
 +F test/walcrash3.test 279640ffafa23f7564529ccd69bfb97849ccae9d
  F test/walcrash4.test e7b6e7639a950a0cca8e210e248c8dad4d63bf20
 -F test/walfault.test 09b8ad7e52d2f54bce50e31aa7ea51412bb9f70ac13c74e669ddcd8b48b0d98d
 +F test/walfault.test 3771f7c8b159438cbf3c56fdaee07b317fa25857cd30dfd9e0d080993cfba952
  F test/walfault2.test e039ac66c78d5561683cacde04097213cdad3b58e2b3f3fe1112862217bfd915
 -F test/walhook.test ed00a40ba7255da22d6b66433ab61fab16a63483
 -F test/walmode.test cd6e7cff618eaaa5910ce57c3657aa50110397f86213886a2400afb9bfec7b7b
 -F test/walnoshm.test 84ca10c544632a756467336b7c3b864d493ee496
 +F test/walhook.test 5d2bdb04fd3e220e2f96e6b566d57e00020bdaec
 +F test/walmode.test edef6af21a8ef04b2acc7c14c44609e53d2a3ac4674e233673de439f258dcba4
 +F test/walnoshm.test 559b878f3aab838971d820329ca35f1caa7b038e
  F test/waloverwrite.test dad2f26567f1b45174e54fbf9a8dc1cb876a7f03
 -F test/walpersist.test 8c6b7e3ec1ba91b5e4dc4e0921d6d3f87cd356a6
 +F test/walpersist.test abd956d66e2f36d2d9d05d3a969f48be6d2ddbec
  F test/walprotocol.test a112aba0b79e3adeaa485fed09484b32c654e97df58e454aa8489ac2cd57bf84
  F test/walprotocol2.test 7d3b6b4bf0b12f8007121b1e6ef714bc99101fb3b48e46371df1db868eebc131
 -F test/walro.test cb438d05ba0d191f10b688e39c4f0cd5b71569a1d1f4440e5bdf3c6880e08c20
 +F test/walro.test cac7fa52dffec99f15c6e266769628d711935e4064dbcd7466ce3479b5011eb5
  F test/walro2.test 0e79dd15cbdb4f482c01ea248373669c732414a726b357d04846a816afafb768
  F test/walrofault.test c70cb6e308c443867701856cce92ad8288cd99488fa52afab77cca6cfd51af68
 -F test/walshared.test 0befc811dcf0b287efae21612304d15576e35417
 -F test/walslow.test c05c68d4dc2700a982f89133ce103a1a84cc285f
 -F test/walthread.test 14b20fcfa6ae152f5d8e12f5dc8a8a724b7ef189f5d8ef1e2ceab79f2af51747
 +F test/walshared.test 04590b10c677f75318701818c50bc0dda5da64ab
 +F test/walslow.test 07a51cbe9d4895d0a90c7af76d14a62d363ac162
 +F test/walthread.test c2bc173d0ca244134ab6bcf8ccd108ee787fb2e7925dbbae973e60fcc6c74851
- F test/walvfs.test f1accd66c876e3a0f6b4bef5b18d13411062d0ff0a0016e32bb41570474e99fc
+ F test/walvfs.test ca81c9f427e0e5434076dfa948fd1d8e6d5ddd192b2fb6991635d81da5f3f5d4
  F test/wapp.tcl b440cd8cf57953d3a49e7ee81e6a18f18efdaf113b69f7d8482b0710a64566ec
  F test/wapptest.tcl 3cca775aede0591756a1fc0da55bbb3715d8c363873fd2cfdd4d555b0a4af57d x
  F test/where.test 19c709c9f0f6ed12c23f909f6592aa55fba34269d5a2898537aa27a22b9ce650
@@@ -1712,9 -1718,9 +1723,9 @@@ F test/win32heap.test 10fd891266bd00af6
  F test/win32lock.test fbf107c91d8f5512be5a5b87c4c42ab9fdd54972
  F test/win32longpath.test 169c75a3b2e43481f4a62122510210c67b08f26d
  F test/win32nolock.test ac4f08811a562e45a5755e661f45ca85892bdbbc
- F test/window1.test 453bb9dcb1b447eddbb4777c97620f02543a4375359723b7372ff09dcf847045
- F test/window2.tcl 66db96fd9fd202bc31ee7f8ce7904cb469564864cff3f74e009bfef8102333f4
- F test/window2.test af2a001ded703bb8f2474fb0edfef170d5aba00f5c1f2aa9f65935b5da13df90
 -F test/window1.test cec56b9a0a2e7ca4bd63b30590c7b049dce9acfd87478e2597e13b67152bd821
++F test/window1.test ab9c9b3b986e156bec808140068f9e67762028f1cfa0767a1fc2153ba42aa9ce
+ F test/window2.tcl 492c125fa550cda1dd3555768a2303b3effbeceee215293adf8871efc25f1476
+ F test/window2.test e466a88bd626d66edc3d352d7d7e1d5531e0079b549ba44efb029d1fbff9fd3c
  F test/window3.tcl acea6e86a4324a210fd608d06741010ca83ded9fde438341cb978c49928faf03
  F test/window3.test e9959a993c8a71e96433be8daaa1827d78b8921e4f12debd7bdbeb3c856ef3cb
  F test/window4.tcl d732df0e81beedc0ba8a563ade68611d322d27303ad0c0c8e4444107c39e84ec
@@@ -1784,12 -1790,12 +1795,12 @@@ F tool/mkmsvcmin.tcl 6ecab9fe22c2c8de4d
  F tool/mkopcodec.tcl d1b6362bd3aa80d5520d4d6f3765badf01f6c43c
  F tool/mkopcodeh.tcl 352a4319c0ad869eb26442bf7c3b015aa15594c21f1cce5a6420dbe999367c21
  F tool/mkopts.tcl 680f785fdb09729fd9ac50632413da4eadbdf9071535e3f26d03795828ab07fa
- F tool/mkpragmatab.tcl f115d63ada8171f9da28dc8e34e043a1a159692d46b89f66b6e681140bc4683d
+ F tool/mkpragmatab.tcl ca12b1c718ececdab2d3aacb437bc3c81ebf68467f19d7974e17f18844a3a48f
  F tool/mkshellc.tcl 70a9978e363b0f3280ca9ce1c46d72563ff479c1930a12a7375e3881b7325712
- F tool/mksourceid.c d458f9004c837bee87a6382228ac20d3eae3c49ea3b0a5aace936f8b60748d3b
+ F tool/mksourceid.c 36aa8020014aed0836fd13c51d6dc9219b0df1761d6b5f58ff5b616211b079b9
  F tool/mkspeedsql.tcl a1a334d288f7adfe6e996f2e712becf076745c97
  F tool/mksqlite3c-noext.tcl 4f7cfef5152b0c91920355cbfc1d608a4ad242cb819f1aea07f6d0274f584a7f
 -F tool/mksqlite3c.tcl 5fed3d75069d8f66f202d3b5200b0cea4aa7108481acd06732a06fdd42eb83a2
 +F tool/mksqlite3c.tcl 202e5c968eb7f7fd0264fa74faeeb0934bf2116adce379ca631830597bcec357
  F tool/mksqlite3h.tcl 080873e3856eceb9d289a08a00c4b30f875ea3feadcbece796bd509b1532792c
  F tool/mksqlite3internalh.tcl eb994013e833359137eb53a55acdad0b5ae1049b
  F tool/mkvsix.tcl b9e0777a213c23156b6542842c238479e496ebf5
@@@ -1851,8 -1857,7 +1862,7 @@@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a9
  F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
  F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
  F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
- P c25289075a6898ad0b6b7a2e9a50fb25527aaa11c436e9b9a0a0c224b6b2716a
- Q +70390bbca49e706649ca5b7c031f0baf416fc38798c17e5f3b73746b3e66e3b5
- R 31f7f72e5852e1b1c6345c32b4f4ea2b
 -P 54bf04811951db6c894f272f870e3e41f8f5e05a25c1115efbbdbd0d8bba54be
 -R ef60df967e796bd9bfc273160d5104d4
++P 0a988ce3405f2fdfe8d80db2893bf675a41ba6ef5c6e29f6a80cfc307d83bfab 3d7434a9d85dae9135473d1c58c22ac01a282e654807aa10be9b39f127291594
++R c61df8cb71b4cf29e42cb6ed48c0a787
  U drh
- Z 8c91fd77cdefe2edbb6204175f7d116c
 -Z 6fa8f0dab0c264087d10e9adb2b33207
++Z 4063aeda5b0324dd58fef8e47f1f5cb3

diff --cc manifest.uuid
index 9fc2fe58173e342edb30d915c5eb2a117b3ed364,cea784779f7477bf0265c6d454910116cae77a5d..f9cd1dd65e07825f711a6efc74d3ad1ba907ee48
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 0a988ce3405f2fdfe8d80db2893bf675a41ba6ef5c6e29f6a80cfc307d83bfab
 -3d7434a9d85dae9135473d1c58c22ac01a282e654807aa10be9b39f127291594
++dadedf41c7cced0cea5c69584ff11405c2fc53518c7ddbea2e4e51cc44b4cd0a

diff --cc src/btree.c
Simple merge

diff --cc src/btreeInt.h
Simple merge

diff --cc src/main.c
Simple merge

diff --cc src/os.c
index 273ec842c2614c7d895356a55559a4471def83eb,b729e95e656b45ca788675d937cebc568a4a179a..2f33a86ec1b5aeaf615861fb2a48cdf051b38aa7
--- 1/src/os.c
--- 2/src/os.c
+++ b/src/os.c
@@@ -216,12 -215,7 +216,12 @@@ int sqlite3OsOpen
    ** down into the VFS layer.  Some SQLITE_OPEN_ flags (for example,
    ** SQLITE_OPEN_FULLMUTEX or SQLITE_OPEN_SHAREDCACHE) are blocked before
    ** reaching the VFS. */
 -  rc = pVfs->xOpen(pVfs, zPath, pFile, flags & 0x1087f7f, pFlagsOut);
 +#if SQLITE_ENABLE_DATA_PROTECTION
-   openFlags = flags & (0x87f7f | SQLITE_OPEN_FILEPROTECTION_MASK);
++  openFlags = flags & (0x1087f7f | SQLITE_OPEN_FILEPROTECTION_MASK);
 +#else
-   openFlags = flags & 0x87f7f;
++  openFlags = flags & 0x1087f7f;
 +#endif
 +  rc = pVfs->xOpen(pVfs, zPath, pFile, openFlags, pFlagsOut);
    assert( rc==SQLITE_OK || pFile->pMethods==0 );
    return rc;
  }

diff --cc src/os_unix.c
index a29b9988dc37e712dc82dfe83ee4a2a0c807cc1d,07ae4bc03a4446e678fc28cf32c0d7581e2af562..206ea5cfe06ef615cc87f43f5947e712716f185b
--- 1/src/os_unix.c
--- 2/src/os_unix.c
+++ b/src/os_unix.c
@@@ -5317,18 -4575,13 +5317,20 @@@ static int unixOpenSharedMemory(unixFil
      }
  
      if( pInode->bProcessLock==0 ){
 +#ifdef __APPLE__
 +      /* On MacOS and iOS, avoid even trying to open a read-only SHM file
 +      ** for writing, because doing so generates scary log messages */
 +      if( osAccess(zShm, R_OK|W_OK)!=0 && (errno==EPERM || errno==EACCES) ){
 +        pShmNode->hShm = -1;
 +      }else
 +#endif
        if( 0==sqlite3_uri_boolean(pDbFd->zPath, "readonly_shm", 0) ){
-         pShmNode->hShm = robust_open(zShm, O_RDWR|O_CREAT,(sStat.st_mode&0777));
+         pShmNode->hShm = robust_open(zShm, O_RDWR|O_CREAT|O_NOFOLLOW,
+                                      (sStat.st_mode&0777));
        }
        if( pShmNode->hShm<0 ){
-         pShmNode->hShm = robust_open(zShm, O_RDONLY, (sStat.st_mode&0777));
+         pShmNode->hShm = robust_open(zShm, O_RDONLY|O_NOFOLLOW,
+                                      (sStat.st_mode&0777));
          if( pShmNode->hShm<0 ){
            rc = unixLogError(SQLITE_CANTOPEN_BKPT, "open", zShm);
            goto shm_open_err;
@@@ -7092,11 -5931,7 +7094,11 @@@ static int unixOpen
    unixFile *p = (unixFile *)pFile;
    int fd = -1;                   /* File descriptor returned by open() */
    int openFlags = 0;             /* Flags to pass to open() */
 -  int eType = flags&0x0FFF00;  /* Type of file to open */
 +#if SQLITE_ENABLE_DATA_PROTECTION
-   int eType = flags&0xFF0FFF00;  /* Type of file to open */
++  int eType = flags&0xFE0FFF00;  /* Type of file to open */
 +#else
-   int eType = flags&0xFFFFFF00;  /* Type of file to open */
++  int eType = flags&0xFEFFFF00;  /* Type of file to open */
 +#endif
    int noLock;                    /* True to omit locking primitives */
    int rc = SQLITE_OK;            /* Function Return Code */
    int ctrlFlags = 0;             /* UNIXFILE_* flags */
@@@ -7206,12 -6041,8 +7208,12 @@@
    if( isReadWrite ) openFlags |= O_RDWR;
    if( isCreate )    openFlags |= O_CREAT;
    if( isExclusive ) openFlags |= (O_EXCL|O_NOFOLLOW);
-   openFlags |= (O_LARGEFILE|O_BINARY);
+   openFlags |= (O_LARGEFILE|O_BINARY|O_NOFOLLOW);
  
 +#if SQLITE_ENABLE_DATA_PROTECTION
 +  p->protFlags = (flags & SQLITE_OPEN_FILEPROTECTION_MASK);
 +#endif
 +    
    if( fd<0 ){
      mode_t openMode;              /* Permissions to create file with */
      uid_t uid;                    /* Userid for the file */

diff --cc src/pager.c
Simple merge

diff --cc src/pager.h
index 4f02ec4c40c75e00cc1bc21ea6699ff3e65f401f,904278944c64dc9c6d337c638f5f5e7ffe95f0d1..5b5b323e6b951a4c2e8e1aa523332c7db4eea997
--- 1/src/pager.h
--- 2/src/pager.h
+++ b/src/pager.h
@@@ -203,10 -203,9 +203,10 @@@ u32 sqlite3PagerDataVersion(Pager*)
    int sqlite3PagerRefcount(Pager*);
  #endif
  int sqlite3PagerMemUsed(Pager*);
- const char *sqlite3PagerFilename(Pager*, int);
+ const char *sqlite3PagerFilename(const Pager*, int);
  sqlite3_vfs *sqlite3PagerVfs(Pager*);
  sqlite3_file *sqlite3PagerFile(Pager*);
 +sqlite3_file *sqlite3PagerWalFile(Pager *pPager);
  sqlite3_file *sqlite3PagerJrnlFile(Pager*);
  const char *sqlite3PagerJournalname(Pager*);
  void *sqlite3PagerTempSpace(Pager*);

diff --cc src/pcache1.c
Simple merge

diff --cc src/pragma.c
Simple merge

diff --cc src/prepare.c
Simple merge

diff --cc src/sqlite.h.in
index 9c683af66cba271cd219cd2c9796535483b60111,c61c0e8b317f1bbb9172ac5768604960e0cb47aa..66d9cf4615921eda22acd7fbdd8143d1ff8cdcb5
--- 1/src/sqlite.h.in
--- 2/src/sqlite.h.in
+++ b/src/sqlite.h.in
@@@ -568,8 -571,8 +571,9 @@@ int sqlite3_exec
  #define SQLITE_OPEN_SHAREDCACHE      0x00020000  /* Ok for sqlite3_open_v2() */
  #define SQLITE_OPEN_PRIVATECACHE     0x00040000  /* Ok for sqlite3_open_v2() */
  #define SQLITE_OPEN_WAL              0x00080000  /* VFS only */
- #define SQLITE_OPEN_FILEPROTECTION_MASK                                 0x00700000
- 
++#define SQLITE_OPEN_FILEPROTECTION_MASK \
++                                     0x00700000
+ #define SQLITE_OPEN_NOFOLLOW         0x01000000  /* Ok for sqlite3_open_v2() */
 -
  /* Reserved:                         0x00F00000 */
  
  /*

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/wal.c
Simple merge

diff --cc test/altertab.test
index 79b54272a0e1043d4f90368a431f82f25ccfbcbd,7dcf8a5e0dfb2de1a7d254c7b01e7e63a3379abd..70b3e72afdadb8731e4f46b8e8dbc7f0bb7662ee
--- 1/test/altertab.test
--- 2/test/altertab.test
+++ b/test/altertab.test
@@@ -547,13 -547,29 +547,33 @@@ ifcapable fts3 
    } {1 {table y1_segments may not be modified}}
  
    do_catchsql_test 16.20 {
 -  do_catchsql_test 16.20 {
+     DROP TABLE y1_segments;
+   } {1 {table y1_segments may not be dropped}}
+ 
++  do_catchsql_test 16.21 {
      ALTER TABLE y1_segments RENAME TO abc;
    } {1 {table y1_segments may not be altered}}
+   sqlite3_db_config db DEFENSIVE 0
+   do_catchsql_test 16.22 {
+     ALTER TABLE y1_segments RENAME TO abc;
+   } {0 {}}
+   sqlite3_db_config db DEFENSIVE 1
+   do_catchsql_test 16.23 {
+     CREATE TABLE y1_segments AS SELECT * FROM abc;
+   } {1 {object name reserved for internal use: y1_segments}}
+   do_catchsql_test 16.24 {
+     CREATE VIEW y1_segments AS SELECT * FROM abc;
+   } {1 {object name reserved for internal use: y1_segments}}
+   sqlite3_db_config db DEFENSIVE 0
+   do_catchsql_test 16.25 {
+     ALTER TABLE abc RENAME TO y1_segments;
+   } {0 {}}
+   sqlite3_db_config db DEFENSIVE 1
  
 +  do_catchsql_test 16.21 {
 +    DROP TABLE y1_segments;
 +  } {1 {table y1_segments may not be dropped}}
 +
    do_execsql_test 16.30 {
      ALTER TABLE y1 RENAME TO z1;
    }

diff --cc test/attach4.test
Simple merge

diff --cc test/exclusive.test
Simple merge

diff --cc test/filter1.test
index 9309b744b15617d01b189b6f2d023c1c632180c3,ee17099d99aa3e0ebf42f5ed4a9a2a0ee4e76d6b..2eb101572e53fb535cd52a29e4aedc838a7de47e
--- 1/test/filter1.test
--- 2/test/filter1.test
+++ b/test/filter1.test
@@@ -184,5 -184,24 +184,44 @@@ do_execsql_test 5.3 
    SELECT count(*) FILTER (WHERE b>2) OVER (ORDER BY b) FROM (SELECT * FROM t1) 
  } {0 1}
  
- finish_test
++#-------------------------------------------------------------------------
++reset_db
++do_execsql_test 5.0 {
++  CREATE TABLE t1(a, b);
++  INSERT INTO t1 VALUES(1, 2);
++  INSERT INTO t1 VALUES(1, 3);
++}
 +
++do_execsql_test 5.1 {
++  SELECT count(*) FILTER (WHERE b>2) FROM (SELECT * FROM t1) 
++} {1}
++
++do_execsql_test 5.2 {
++  SELECT count(*) FILTER (WHERE b>2) OVER () FROM (SELECT * FROM t1) 
++} {1 1}
++
++do_execsql_test 5.3 {
++  SELECT count(*) FILTER (WHERE b>2) OVER (ORDER BY b) FROM (SELECT * FROM t1) 
++} {0 1}
++
+ #-------------------------------------------------------------------------
+ reset_db
+ do_execsql_test 6.0 {
+   CREATE TABLE t1(a,b);
+   INSERT INTO t1 VALUES(1,1);
+   INSERT INTO t1 VALUES(2,2);
+   CREATE TABLE t2(x,y);
+   INSERT INTO t2 VALUES(1,1);
+ }
+ 
+ do_execsql_test 6.1 {
+   SELECT (SELECT COUNT(a) FILTER(WHERE x) FROM t2) FROM t1;
+ } {1 1}
+ do_execsql_test 6.2 {
+   SELECT (SELECT COUNT(a+x) FROM t2) FROM t1;
+ } {1 1}
+ do_execsql_test 6.3 {
+   SELECT (SELECT COUNT(a) FROM t2) FROM t1;
+ } {2}
+ 
+ finish_test

diff --cc test/join.test
index 682186200bb696444d37086cf0bc56eea26b1a88,391e0681cef919012a0fac9b9a108667ae524077..6d93848df4507041d99493ad105ba2575fff602a
--- 1/test/join.test
--- 2/test/join.test
+++ b/test/join.test
@@@ -905,5 -905,123 +905,144 @@@ do_execsql_test join-18.4 
    SELECT NOT(v0.a IS FALSE) FROM v0
  } {1}
  
++#-------------------------------------------------------------------------
++reset_db
++do_execsql_test join-18.1 {
++  CREATE TABLE t0(a);
++  CREATE TABLE t1(b);
++  CREATE VIEW v0 AS SELECT a FROM t1 LEFT JOIN t0;
++  INSERT INTO t1 VALUES (1);
++} {}
++
++do_execsql_test join-18.2 {
++  SELECT * FROM v0 WHERE NOT(v0.a IS FALSE);
++} {{}}
++
++do_execsql_test join-18.3 {
++  SELECT * FROM t1 LEFT JOIN t0 WHERE NOT(a IS FALSE);
++} {1 {}}
++
++do_execsql_test join-18.4 {
++  SELECT NOT(v0.a IS FALSE) FROM v0
++} {1}
++
+ #-------------------------------------------------------------------------
+ reset_db
+ do_execsql_test join-19.0 {
+   CREATE TABLE t1(a);
+   CREATE TABLE t2(b);
+   INSERT INTO t1(a) VALUES(0);
+   CREATE VIEW v0(c) AS SELECT t2.b FROM t1 LEFT JOIN t2;
+ }
+ 
+ do_execsql_test join-19.1 {
+   SELECT * FROM v0 WHERE v0.c NOTNULL NOTNULL; 
+ } {{}}
+ 
+ do_execsql_test join-19.2 {
+   SELECT * FROM t1 LEFT JOIN t2
+ } {0 {}}
+ 
+ do_execsql_test join-19.3 {
+   SELECT * FROM t1 LEFT JOIN t2 WHERE (b IS NOT NULL) IS NOT NULL; 
+ } {0 {}}
+ 
+ do_execsql_test join-19.4 {
+   SELECT (b IS NOT NULL) IS NOT NULL FROM t1 LEFT JOIN t2
+ } {1}
+ 
+ do_execsql_test join-19.5 {
+   SELECT * FROM t1 LEFT JOIN t2 WHERE 
+     (b IS NOT NULL AND b IS NOT NULL) IS NOT NULL; 
+ } {0 {}}
+ 
+ # 2019-11-02 ticket 623eff57e76d45f6
+ # The optimization of exclusing the WHERE expression of a partial index
+ # from the WHERE clause of the query if the index is used does not work
+ # of the table of the index is the right-hand table of a LEFT JOIN.
+ #
+ db close
+ sqlite3 db :memory:
+ do_execsql_test join-20.1 {
+   CREATE TABLE t1(c1);
+   CREATE TABLE t0(c0);
+   INSERT INTO t0(c0) VALUES (0);
+   SELECT * FROM t0 LEFT JOIN t1 WHERE NULL IN (c1);
+ } {}
+ do_execsql_test join-20.2 {
+   CREATE INDEX t1x ON t1(0) WHERE NULL IN (c1);
+   SELECT * FROM t0 LEFT JOIN t1 WHERE NULL IN (c1);
+ } {}
+ 
+ # 2019-11-30 ticket 7f39060a24b47353
+ # Do not allow a WHERE clause term to qualify a partial index on the
+ # right table of a LEFT JOIN.
+ #
+ do_execsql_test join-21.10 {
+   DROP TABLE t0;
+   DROP TABLE t1;
+   CREATE TABLE t0(aa);
+   CREATE TABLE t1(bb);
+   INSERT INTO t0(aa) VALUES (1);
+   INSERT INTO t1(bb) VALUES (1);
+   SELECT 11, * FROM t1 LEFT JOIN t0 WHERE aa ISNULL;
+   SELECT 12, * FROM t1 LEFT JOIN t0 WHERE +aa ISNULL;
+   SELECT 13, * FROM t1 LEFT JOIN t0 ON aa ISNULL;
+   SELECT 14, * FROM t1 LEFT JOIN t0 ON +aa ISNULL;
+   CREATE INDEX i0 ON t0(aa) WHERE aa ISNULL;
+   SELECT 21, * FROM t1 LEFT JOIN t0 WHERE aa ISNULL;
+   SELECT 22, * FROM t1 LEFT JOIN t0 WHERE +aa ISNULL;
+   SELECT 23, * FROM t1 LEFT JOIN t0 ON aa ISNULL;
+   SELECT 24, * FROM t1 LEFT JOIN t0 ON +aa ISNULL;
+ } {13 1 {} 14 1 {} 23 1 {} 24 1 {}}
+ 
+ # 2019-12-18 problem with a LEFT JOIN where the RHS is a view.
+ # Detected by Yongheng and Rui.
+ # Follows from the optimization attempt of check-in 41c27bc0ff1d3135
+ # on 2017-04-18
+ #
+ reset_db
+ do_execsql_test join-22.10 {
+   CREATE TABLE t0(a, b);
+   CREATE INDEX t0a ON t0(a);
+   INSERT INTO t0 VALUES(10,10),(10,11),(10,12);
+   SELECT DISTINCT c FROM t0 LEFT JOIN (SELECT a+1 AS c FROM t0) ORDER BY c ;
+ } {11}
+ 
+ # 2019-12-22 ticket 7929c1efb2d67e98
+ #
+ reset_db
+ do_execsql_test join-23.10 {
+   CREATE TABLE t0(c0);
+   INSERT INTO t0(c0) VALUES(123);
+   CREATE VIEW v0(c0) AS SELECT 0 GROUP BY 1;
+   SELECT t0.c0, v0.c0, vt0.name
+    FROM v0, t0 LEFT JOIN pragma_table_info('t0') AS vt0
+      ON vt0.name LIKE 'c0'
+    WHERE v0.c0 == 0;
+ } {123 0 c0}
+ 
+ #-------------------------------------------------------------------------
+ reset_db
+ do_execsql_test join-24.1 {
+   CREATE TABLE t1(a PRIMARY KEY, x);
+   CREATE TABLE t2(b INT);
+   CREATE INDEX t1aa ON t1(a, a);
+ 
+   INSERT INTO t1 VALUES('abc', 'def');
+   INSERT INTO t2 VALUES(1);
+ }
+ 
+ do_execsql_test join-24.2 {
+   SELECT * FROM t2 JOIN t1 WHERE a='abc' AND x='def';
+ } {1 abc def}
+ do_execsql_test join-24.3 {
+   SELECT * FROM t2 JOIN t1 WHERE a='abc' AND x='abc';
+ } {}
+ 
+ do_execsql_test join-24.2 {
+   SELECT * FROM t2 LEFT JOIN t1 ON a=0 WHERE (x='x' OR x IS NULL);
+ } {1 {} {}}
+ 
  finish_test
  

diff --cc test/journal3.test
Simple merge

diff --cc test/pragma4.test
Simple merge

diff --cc test/tester.tcl
index 9498735cdccd1291115389250afd0e02f6f68d57,05c52343f095a629169493a65e898bb46e86f3c2..c6207de33c93301b354b9192da2e6b3d457d8477
--- 1/test/tester.tcl
--- 2/test/tester.tcl
+++ b/test/tester.tcl
@@@ -586,25 -592,9 +592,26 @@@ if {[info exists cmdlinearg]==0} 
  # way if an individual test file changes the soft-heap-limit, it
  # will be reset at the start of the next test file.
  #
- sqlite3_soft_heap_limit $cmdlinearg(soft-heap-limit)
+ sqlite3_soft_heap_limit64 $cmdlinearg(soft-heap-limit)
+ sqlite3_hard_heap_limit64 $cmdlinearg(hard-heap-limit)
  
 +proc forced_proxy_locking {} {
 +  if $::sqlite_options(lock_proxy_pragmas)&&$::sqlite_options(prefer_proxy_locking) {
 +    set force_proxy_value 0
 +    set force_key "SQLITE_FORCE_PROXY_LOCKING="
 +    foreach {env_pair} [exec env] { 
 +      if { [string first $force_key $env_pair] == 0} {
 +        set force_proxy_value [string range $env_pair [string length $force_key] end]
 +      }
 +    }
 +    if { "$force_proxy_value " == "1 " } {
 +      return 1
 +    } 
 +  }
 +  return 0
 +}
 +
 +
  # Create a test database
  #
  proc reset_db {} {

diff --cc test/window1.test
index 7a41e7268d3b10b2a0629401faea482e285587dc,833e211fbd3cb43b8ba543ddd32e7d8062cb0a9c..a7473d9a857b309cf79dac76a95da4172ba2760c
--- 1/test/window1.test
--- 2/test/window1.test
+++ b/test/window1.test
@@@ -1234,4 -1234,364 +1234,363 @@@ do_catchsql_test 31.3 
    );
  } {1 {frame ending offset must be a non-negative integer}}
  
 -
+ # 2019-11-16 chromium issue 1025467
+ db close
+ sqlite3 db :memory:
+ do_catchsql_test 32.10 {
+   CREATE VIEW a AS SELECT NULL INTERSECT SELECT NULL ORDER BY s() OVER R;
+   CREATE TABLE a0 AS SELECT 0;
+   ALTER TABLE a0 RENAME TO S;
+ } {1 {error in view a: 1st ORDER BY term does not match any column in the result set}}
+ 
+ reset_db
+ do_execsql_test 33.1 {
+   CREATE TABLE t1(aa, bb);
+   INSERT INTO t1 VALUES(1, 2);
+   INSERT INTO t1 VALUES(5, 6);
+   CREATE TABLE t2(x);
+   INSERT INTO t2 VALUES(1);
+ }
+ do_execsql_test 33.2 {
+   SELECT (SELECT DISTINCT sum(aa) OVER() FROM t1 ORDER BY 1), x FROM t2 
+   ORDER BY 1;
+ } {6 1}
+ 
+ reset_db
+ do_execsql_test 34.1 {
+   CREATE TABLE t1(a,b,c);
+ }
+ do_execsql_test 34.2 {
+   SELECT avg(a) OVER (
+       ORDER BY (SELECT sum(b) OVER ()
+         FROM t1 ORDER BY (
+           SELECT total(d) OVER (ORDER BY c)
+           FROM (SELECT 1 AS d) ORDER BY 1
+           )
+         )
+       )
+   FROM t1;
+ }
+ 
+ #-------------------------------------------------------------------------
+ reset_db
+ do_catchsql_test 35.0 {
+   SELECT * WINDOW f AS () ORDER BY name COLLATE nocase;
+ } {1 {no tables specified}}
+ 
+ do_catchsql_test 35.1 {
+   VALUES(1) INTERSECT SELECT * WINDOW f AS () ORDER BY x COLLATE nocase;
+ } {1 {no tables specified}}
+ 
+ do_execsql_test 35.2 {
+   CREATE TABLE t1(x);
+   INSERT INTO t1 VALUES(1), (2), (3);
+   VALUES(1) INTERSECT 
+   SELECT sum(x) OVER f FROM t1 WINDOW f AS (ORDER BY x) ORDER BY 1;
+ } {1}
+ 
+ do_execsql_test 35.3 {
+   VALUES(8) EXCEPT 
+   SELECT sum(x) OVER f FROM t1 WINDOW f AS (ORDER BY x) ORDER BY 1;
+ } {8}
+ 
+ do_execsql_test 35.4 {
+   VALUES(1) UNION 
+   SELECT sum(x) OVER f FROM t1 WINDOW f AS (ORDER BY x) ORDER BY 1;
+ } {1 3 6}
+ 
+ # 2019-12-07 gramfuzz find
+ #
+ do_execsql_test 36.10 {
+   VALUES(count(*)OVER());
+ } {1}
+ do_execsql_test 36.20 {
+   VALUES(count(*)OVER()),(2);
+ } {1 2}
+ do_execsql_test 36.30 {
+   VALUES(2),(count(*)OVER());
+ } {2 1}
+ do_execsql_test 36.40 {
+   VALUES(2),(3),(count(*)OVER()),(4),(5);
+ } {2 3 1 4 5}
+ 
+ # 2019-12-17 crash test case found by Yongheng and Rui
+ # See check-in 1ca0bd982ab1183b
+ #
+ reset_db
+ do_execsql_test 37.10 {
+   CREATE TABLE t0(a UNIQUE, b PRIMARY KEY);
+   CREATE VIEW v0(c) AS SELECT max((SELECT count(a)OVER(ORDER BY 1))) FROM t0;
+   SELECT c FROM v0 WHERE c BETWEEN 10 AND 20;
+ } {}
+ do_execsql_test 37.20 {
+   DROP VIEW v0;
+   CREATE VIEW v0(c) AS SELECT max((SELECT count(a)OVER(ORDER BY 1234))) FROM t0;
+   SELECT c FROM v0 WHERE c BETWEEN -10 AND 20;
+ } {}
+ 
+ # 2019-12-20 mrigger reported problem with a FILTER clause on an aggregate
+ # in a join.
+ #
+ reset_db
+ do_catchsql_test 38.10 {
+   CREATE TABLE t0(c0);
+   CREATE TABLE t1(c0, c1 UNIQUE);
+   INSERT INTO t0(c0) VALUES(1);
+   INSERT INTO t1(c0,c1) VALUES(2,3);
+   SELECT COUNT(*) FROM t0, t1 WHERE (SELECT AVG(0) FILTER(WHERE t1.c1));
+ } {1 {misuse of aggregate: AVG()}}
+ do_execsql_test 38.20 {
+   SELECT COUNT(*), AVG(1) FILTER(WHERE t1.c1) FROM t0, t1;
+ } {1 1.0}
+ do_catchsql_test 38.30 {
+   SELECT COUNT(*) FROM t0, t1 WHERE (SELECT AVG(1) FILTER(WHERE t1.c1));
+ } {1 {misuse of aggregate: AVG()}}
+ 
+ reset_db
+ do_execsql_test 39.1 {
+   CREATE TABLE t0(c0 UNIQUE);
+ }
+ do_execsql_test 39.2 {
+   SELECT FIRST_VALUE(0) OVER();
+ } {0}
+ do_execsql_test 39.3 {
+   SELECT * FROM t0 WHERE(c0, 0) IN(SELECT FIRST_VALUE(0) OVER(), 0);
+ }
+ do_execsql_test 39.4 {
+   SELECT * FROM t0 WHERE (t0.c0, 1) IN(SELECT NTILE(1) OVER(), 0 FROM t0);
+ }
+ 
+ ifcapable rtree {
+   # 2019-12-25 ticket d87336c81c7d0873
+   #
+   reset_db
+   do_catchsql_test 40.1 {
+     CREATE VIRTUAL TABLE t0 USING rtree(c0, c1, c2);
+     SELECT * FROM t0
+      WHERE ((0,0) IN (SELECT COUNT(*),LAG(5)OVER(PARTITION BY 0) FROM t0),0)<=(c1,0);
+   } {0 {}}
+ }
+ 
+ #-------------------------------------------------------------------------
+ reset_db
+ do_execsql_test 41.1 {
+   CREATE TABLE t1(a, b, c);
+   INSERT INTO t1 VALUES(NULL,'bb',355);
+   INSERT INTO t1 VALUES('CC','aa',158);
+   INSERT INTO t1 VALUES('GG','bb',929);
+   INSERT INTO t1 VALUES('FF','Rb',574);
+ }
+ 
+ do_execsql_test 41.2 {
+   SELECT min(c) OVER (
+     ORDER BY a RANGE BETWEEN 5.2 PRECEDING AND 0.1 PRECEDING
+   ) FROM t1
+ } {355 158 574 929}
+ 
+ do_execsql_test 41.2 {
+   SELECT min(c) OVER (
+     ORDER BY a RANGE BETWEEN 5.2 PRECEDING AND 0.1 PRECEDING
+   ) << 100 FROM t1
+ } {0 0 0 0}
+ 
+ do_execsql_test 41.3 {
+   SELECT
+     min(c) OVER win3 << first_value(c) OVER win3,
+     min(c) OVER win3 << first_value(c) OVER win3
+   FROM t1
+   WINDOW win3 AS (
+     PARTITION BY 6 ORDER BY a RANGE BETWEEN 5.2 PRECEDING AND 0.1 PRECEDING
+   );
+ } {0 0  0 0  0 0  0 0}
+ 
+ #-------------------------------------------------------------------------
+ reset_db
+ do_execsql_test 42.1 {
+   CREATE TABLE t1(a, b, c);
+   INSERT INTO t1 VALUES(1, 1, 1);
+   INSERT INTO t1 VALUES(2, 2, 2);
+ }
+ do_execsql_test 42.2 {
+   SELECT * FROM t1 WHERE (0, 0) IN ( SELECT count(*), 0 FROM t1 )
+ } {}
+ do_execsql_test 42.3 {
+   SELECT * FROM t1 WHERE (2, 0) IN ( SELECT count(*), 0 FROM t1 )
+ } {1 1 1 2 2 2}
+ 
+ do_execsql_test 42.3 {
+   SELECT count(*), max(a) OVER () FROM t1 GROUP BY c; 
+ } {1 2 1 2}
+ 
+ do_execsql_test 42.4 {
+   SELECT sum(a), max(b) OVER () FROM t1;
+ } {3 1}
+ 
+ do_execsql_test 42.5 {
+   CREATE TABLE t2(a, b);
+   INSERT INTO t2 VALUES('a', 1);
+   INSERT INTO t2 VALUES('a', 2);
+   INSERT INTO t2 VALUES('a', 3);
+   INSERT INTO t2 VALUES('b', 4);
+   INSERT INTO t2 VALUES('b', 5);
+   INSERT INTO t2 VALUES('b', 6);
+ }
+ 
+ do_execsql_test 42.6 {
+   SELECT a, sum(b), sum( sum(b) ) OVER (ORDER BY a) FROM t2 GROUP BY a;
+ } {a 6 6   b 15 21}
+ 
+ do_execsql_test 42.7 {
+   SELECT sum(b), sum( sum(b) ) OVER (ORDER BY a) FROM t2;
+ } {21 21}
+ 
+ #-------------------------------------------------------------------------
+ reset_db
+ do_execsql_test 43.1.1 {
+   CREATE TABLE t1(x INTEGER PRIMARY KEY);
+   INSERT INTO t1 VALUES (10);
+ }
+ do_catchsql_test 43.1.2 {
+   SELECT count() OVER() AS m FROM t1 ORDER BY (SELECT m);
+ } {1 {misuse of aliased window function m}}
+ 
+ reset_db
+ do_execsql_test 43.2.1 {
+   CREATE TABLE t1(a INTEGER PRIMARY KEY, b INTEGER);
+   INSERT INTO t1(a, b) VALUES(1,  10); -- 10
+   INSERT INTO t1(a, b) VALUES(2,  15); -- 25
+   INSERT INTO t1(a, b) VALUES(3,  -5); -- 20
+   INSERT INTO t1(a, b) VALUES(4,  -5); -- 15
+   INSERT INTO t1(a, b) VALUES(5,  20); -- 35
+   INSERT INTO t1(a, b) VALUES(6, -11); -- 24
+ }
+ 
+ do_execsql_test 43.2.2 {
+   SELECT a, sum(b) OVER (ORDER BY a) AS abc FROM t1 ORDER BY 2
+ } {
+   1 10   4 15   3 20   6 24   2 25   5 35
+ }
+ 
+ do_execsql_test 43.2.3 {
+   SELECT a, sum(b) OVER (ORDER BY a) AS abc FROM t1 ORDER BY abc
+ } {
+   1 10   4 15   3 20   6 24   2 25   5 35
+ }
+ 
+ do_execsql_test 43.2.4 {
+   SELECT a, sum(b) OVER (ORDER BY a) AS abc FROM t1 ORDER BY abc+5
+ } {
+   1 10   4 15   3 20   6 24   2 25   5 35
+ }
+ 
+ do_catchsql_test 43.2.5 {
+   SELECT a, sum(b) OVER (ORDER BY a) AS abc FROM t1 ORDER BY (SELECT abc)
+ } {1 {misuse of aliased window function abc}}
+ 
+ do_catchsql_test 43.2.6 {
+   SELECT a, 1+sum(b) OVER (ORDER BY a) AS abc FROM t1 ORDER BY (SELECT abc)
+ } {1 {misuse of aliased window function abc}}
+ 
+ #-------------------------------------------------------------------------
+ reset_db
+ do_execsql_test 44.1 {
+   CREATE TABLE t0(c0);
+ }
+ 
+ do_catchsql_test 44.2.1 {
+   SELECT ntile(0) OVER ();
+ } {1 {argument of ntile must be a positive integer}}
+ do_catchsql_test 44.2.2 {
+   SELECT (0, 0) IN(SELECT MIN(c0), NTILE(0) OVER()) FROM t0;
+ } {1 {argument of ntile must be a positive integer}}
+ 
+ do_execsql_test 44.3.1 {
+   SELECT ntile(1) OVER ();
+ } {1}
+ do_execsql_test 44.3.2 {
+   SELECT (0, 0) IN(SELECT MIN(c0), NTILE(1) OVER()) FROM t0;
+ } {0}
+ 
+ do_execsql_test 44.4.2 {
+   INSERT INTO t0 VALUES(2), (1), (0);
+   SELECT (0, 1) IN(SELECT MIN(c0), NTILE(1) OVER()) FROM t0;
+ } {1}
+ 
+ #-------------------------------------------------------------------------
+ reset_db
+ do_execsql_test 45.1 {
+   CREATE TABLE t0(x);
+   CREATE TABLE t1(a);
+   INSERT INTO t1 VALUES(1000);
+   INSERT INTO t1 VALUES(1000);
+   INSERT INTO t0 VALUES(10000);
+ }
+ do_execsql_test 45.2 {
+   SELECT * FROM (
+       SELECT sum (a) OVER() FROM t1 UNION ALL SELECT x FROM t0
+   );
+ } {2000 2000 10000}
+ 
+ #-------------------------------------------------------------------------
+ reset_db
+ do_execsql_test 46.1 {
+   CREATE TABLE t1 (a);
+   CREATE INDEX i1 ON t1(a);
+ 
+   INSERT INTO t1 VALUES (10);
+ }
+ 
+ do_execsql_test 46.2 {
+   SELECT (SELECT sum(a) OVER(ORDER BY a)) FROM t1
+ } 10
+ 
+ do_execsql_test 46.3 {
+   SELECT * FROM t1 WHERE (SELECT sum(a) OVER(ORDER BY a));
+ } 10
+ 
+ do_execsql_test 46.4 {
+   SELECT * FROM t1 NATURAL JOIN t1
+     WHERE a=1
+     OR ((SELECT sum(a)OVER(ORDER BY a)) AND a<=10)
+ } 10
+ 
+ #-------------------------------------------------------------------------
+ reset_db
+ do_execsql_test 47.0 {
+   CREATE TABLE t1(
+       a,
+       e,
+       f,
+       g UNIQUE,
+       h UNIQUE
+   );
+ }
+ 
+ do_execsql_test 47.1 {
+   CREATE VIEW t2(k) AS
+      SELECT e FROM t1 WHERE g = 'abc' OR h BETWEEN 10 AND f;
+ }
+ 
+ do_catchsql_test 47.2 {
+   SELECT 234 FROM t2
+     WHERE k=1
+     OR (SELECT k FROM t2 WHERE (SELECT sum(a) OVER() FROM t1 GROUP BY 1));
+ } {1 {misuse of window function sum()}}
+ 
+ #-------------------------------------------------------------------------
+ reset_db
+ do_execsql_test 48.0 {
+   CREATE TABLE t1(a);
+   INSERT INTO t1 VALUES(1);
+   INSERT INTO t1 VALUES(2);
+   INSERT INTO t1 VALUES(3);
+   SELECT (SELECT max(x)OVER(ORDER BY x) + min(x)OVER(ORDER BY x))
+     FROM (SELECT (SELECT sum(a) FROM t1) AS x FROM t1);
+ } {12 12 12}
+ 
+ do_execsql_test 48.1 {
+   SELECT (SELECT max(x)OVER(ORDER BY x) + min(x)OVER(ORDER BY x))
+     FROM (SELECT (SELECT sum(a) FROM t1 GROUP BY a) AS x FROM t1);
+ } {2 2 2}
+ 
  finish_test