From: larrybr <larrybr@noemail.net>
Date: Mon, 17 Jan 2022 03:53:37 +0000 (+0000)
Subject: Merge from trunk, w/adapations. (.ar still broken)
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c4e13636a25a61eb4ac9a49359410417108678cc;p=thirdparty%2Fsqlite.git

Merge from trunk, w/adapations. (.ar still broken)

FossilOrigin-Name: e09a6dd7b9de6c53e1dd59967c3455b38551024bb8d5d1606e7e7324b3b65931
---

c4e13636a25a61eb4ac9a49359410417108678cc
diff --cc manifest
index 0d1636c630,1ba1d89134..495c464001
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Bring\s.import\s--schema\senhancement\sin.\sRefine\smkshellc\sinclude\slogic.
- D 2022-01-17T03:25:00.240
 -C Fix\stest\scases\sso\sthat\sthey\sall\sstill\swork\seven\swith\s-DSQLITE_DQS=0.
 -D 2022-01-16T19:11:13.524
++C Merge\sfrom\strunk,\sw/adapations.\s(.ar\sstill\sbroken)
++D 2022-01-17T03:53:37.069
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@@ -34,13 -34,13 +34,14 @@@ F autoconf/tea/win/rules.vc c511f222b80
  F config.guess 883205ddf25b46f10c181818bf42c09da9888884af96f79e1719264345053bd6
  F config.h.in 6376abec766e9a0785178b1823b5a587e9f1ccbc
  F config.sub c2d0260f17f3e4bc0b6808fccf1b291cb5e9126c14fc5890efc77b9fd0175559
- F configure 56f2a6637cdba53788673ccc229c4f95ab3ab6fe67036e0b1291dc615e531a58 x
- F configure.ac c8ba54bac7e73e000acdfef5e394fe21a3876aa09d0f5c07131bf5ac5a525299
+ F configure a2877fe63cc821af0df41abe70f1f7c4e97cb7e23a42e0a1402e8a2f55a88aa2 x
+ F configure.ac 3ef6eeff4387585bfcab76b0c3f6e15a0618587bb90245dd5d44e4378141bb35
  F contrib/sqlitecon.tcl 210a913ad63f9f991070821e599d600bd913e0ad
  F doc/F2FS.txt c1d4a0ae9711cfe0e1d8b019d154f1c29e0d3abfe820787ba1e9ed7691160fcd
+ F doc/json-enhancements.md e356fc834781f1f1aa22ee300027a270b2c960122468499bf347bb123ce1ea4f
  F doc/lemon.html efc0cd2345d66905505d98f862e1c571512def0ceb5b016cb658fd4918eb76a3
  F doc/pager-invariants.txt 27fed9a70ddad2088750c4a2b493b63853da2710
 +F doc/shell_extend.html c2ce1584bd976613c984a0b7ea4680ef2d2c0ab0642540d730e0a899648e2294
  F doc/trusted-schema.md 33625008620e879c7bcfbbfa079587612c434fa094d338b08242288d358c3e8a
  F doc/vdbesort-memory.md 4da2639c14cd24a31e0af694b1a8dd37eaf277aff3867e9a8cc14046bc49df56
  F doc/vfs-shm.txt e101f27ea02a8387ce46a05be2b1a902a021d37a
@@@ -513,9 -512,10 +513,10 @@@ F src/hash.h 3340ab6e1d13e725571d7cee6d
  F src/hwtime.h cb1d7e3e1ed94b7aa6fde95ae2c2daccc3df826be26fc9ed7fd90d1750ae6144
  F src/in-operator.md 10cd8f4bcd225a32518407c2fb2484089112fd71
  F src/insert.c e528416ff5d86fc5d656ea6a26f03fde39836b6175f93048c32a03cb2ee16743
 -F src/json.c f3bbaf6a4df6f5ada5b71e01666f5cd67642c616cd8be47dbfa5b5768dfa71d4
++F src/json.c f3bbaf6a4df6f5ada5b71e01666f5cd67642c616cd8be47dbfa5b5768dfa71d4 w ext/misc/json1.c
  F src/legacy.c d7874bc885906868cd51e6c2156698f2754f02d9eee1bae2d687323c3ca8e5aa
  F src/loadext.c 95db1fe62c5973f1c5d9c53f6083e21a73ece14cdd47eeca0639691332e85c4d
- F src/main.c aa24539f6c26460543d51027ea14b79cad35e34bc9d4907bc349b52b71066644
+ F src/main.c 2b6b0dbfeb14d4bb57e368604b0736b2aa42b51b00339d399b01d6b1fc9b4960
  F src/malloc.c ef796bcc0e81d845d59a469f1cf235056caf9024172fd524e32136e65593647b
  F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
  F src/mem1.c c12a42539b1ba105e3707d0e628ad70e611040d8f5e38cf942cee30c867083de
@@@ -552,9 -551,8 +553,9 @@@ F src/printf.c 975f1f5417f2526365b6e6d7
  F src/random.c 097dc8b31b8fba5a9aca1697aeb9fd82078ec91be734c16bffda620ced7ab83c
  F src/resolve.c 359bc0e445d427583d2ab6110433a5dc777f64a0ecdf8d24826d8b475233ead9
  F src/rowset.c ba9515a922af32abe1f7d39406b9d35730ed65efab9443dc5702693b60854c92
- F src/select.c 342e096c2737a3ee60753e91de6e6660c7f59cd2988b3e1ab641d38fd885003f
- F src/shell.c.in c49f89c8c7e352f5630e47759e0371947103435d8f819fb4717001f5a35bec55
+ F src/select.c a4a23a70f0a24a1103ac9698f6be181a6ec7ff6c19e03e8899c43cb6d2af09d6
 -F src/shell.c.in 4690f216dc4da0c104a8fd9f9e12bec0483242e630324aa7a3ccd155922e346e
++F src/shell.c.in 91c860b881d35f3d343ccb610d8db78c57d06aa01a00d7c59ee2f7530fab2553
 +F src/shext_linkage.h 5897e8140a06cb733d07a927994b30d41225eb93b5b8cf2ad0e3460cb4e95fd6
  F src/sqlite.h.in a5e0d6bd47e67aabf1475986d36bdcc7bfa9e06566790ebf8e3aa7fa551c9f99
  F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
  F src/sqlite3ext.h 01eb85e4f2759a5ee79c183f4b2877889d4ffdc49d27ae74529c9579e3c8c0ef
@@@ -1385,11 -1384,11 +1387,11 @@@ F test/sharedA.test 49d87ec54ab640fbbc3
  F test/sharedB.test 16cc7178e20965d75278f410943109b77b2e645e
  F test/shared_err.test 32634e404a3317eeb94abc7a099c556a346fdb8fb3858dbe222a4cbb8926a939
  F test/sharedlock.test 5ede3c37439067c43b0198f580fd374ebf15d304
- F test/shell1.test a531d4f08eaca79357e3892a00b109a1a2030840a590c7bb3f18cce14932fdcb
- F test/shell2.test de123dd6be4b774b5ebdc81b29b3515c29c4a6a81bd5d2e1c38605d2f775a25a
 -F test/shell1.test 70f46b5d07776a107335c3c2c9cbd0431d44637bfeae1f6b9ded5e33b4c7c0bf
 -F test/shell2.test f00a0501c00583cbc46f7510e1d713366326b2b3e63d06d15937284171a8787c
++F test/shell1.test 4350026b456dc4b82641d459e712834fcb1104b0e44d8d62209b0f80d9439614
++F test/shell2.test 2e63015532de08ed9459657374a68e128a23235f90125f7a99ed383e9bd25886
  F test/shell3.test cb4b835a901742c9719437a89171172ecc4a8823ad97349af8e4e841e6f82566
  F test/shell4.test 3ed6c4b42fd695efcbc25d69ef759dbb15855ca8e52ba6c5ee076f8b435f48be
 -F test/shell5.test b85069bfcf3159b225228629ab2c3e69aa923d098fea8ea074b5dcd743522e2c
 +F test/shell5.test 84edcdd1754b8ae279329ea2bb999f3cbb9f55b1339fc27995c1cdb2cf0c9918
  F test/shell6.test 1ceb51b2678c472ba6cf1e5da96679ce8347889fe2c3bf93a0e0fa73f00b00d3
  F test/shell7.test 115132f66d0463417f408562cc2cf534f6bbc6d83a6d50f0072a9eb171bae97f
  F test/shell8.test 388471d16e4de767333107e30653983f186232c0e863f4490bb230419e830aae
@@@ -1939,10 -1938,8 +1941,8 @@@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a9
  F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
  F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
  F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
- P b1f3b317c08f467fa8d4cbafdf08ef859b8f84ce371d19c13f87f7a1f2313b98
- Q +38d9dbca166078013a44214c88805fc7cca578976ceed9fc62f5159a38ec96a7
- Q +bff9153ceedcc7be77f2daf5139fee29c2fab742ff1fce49877965423a7d4be3
- R 174a8be2eb19d15c0a189ca59e03dfc3
 -P 092ad64faa4ae93b1e09ccd52159621d619e6817bcb4573331e9053d97f731fd
 -R 3f20ad9a9f1d809380bd91f8dd5db646
 -U drh
 -Z f5dfc5249ab1cb55ce73ad103fb81155
++P e38f45cdc5694dc126bc6a41d3657807fc9953487f4ae26a802a00cbbd12aa61 4883776669ee2f2310ea82b0d6df4d008eebaa7cb252102539cf21a635402ebb
++R 2792444b019f416450346dfe07444ddd
 +U larrybr
- Z f12762a64bd7b7363f72a3839c277d50
++Z 17f54a1c991e5b81fbd749e44dce19c6
  # Remove this line to create a well-formed Fossil manifest.
diff --cc manifest.uuid
index 2522229a56,6addecdf0a..5d790fd867
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- e38f45cdc5694dc126bc6a41d3657807fc9953487f4ae26a802a00cbbd12aa61
 -4883776669ee2f2310ea82b0d6df4d008eebaa7cb252102539cf21a635402ebb
++e09a6dd7b9de6c53e1dd59967c3455b38551024bb8d5d1606e7e7324b3b65931
diff --cc src/shell.c.in
index d3966751b4,c15d2e54d4..77930c29f6
--- a/src/shell.c.in
+++ b/src/shell.c.in
@@@ -3463,7 -3366,10 +3463,8 @@@ static void exec_prepared_stmt
          /* extract the data and data types */
          for(i=0; i<nCol; i++){
            aiTypes[i] = x = sqlite3_column_type(pStmt, i);
-           if( x==SQLITE_BLOB && pArg && pArg->cMode==MODE_Insert ){
 -          if( x==SQLITE_BLOB
 -           && pArg
 -           && (pArg->cMode==MODE_Insert || pArg->cMode==MODE_Quote)
 -          ){
++          if( x==SQLITE_BLOB && pArg
++           && (pArg->cMode==MODE_Insert || pArg->cMode==MODE_Quote) ){
              azVals[i] = "";
            }else{
              azVals[i] = (char*)sqlite3_column_text(pStmt, i);
diff --cc test/shell1.test
index dbbfa62b71,75118b9419..8726454769
--- a/test/shell1.test
+++ b/test/shell1.test
@@@ -74,8 -74,8 +74,8 @@@ do_test shell1-1.3.1 
    catchcmd "-init FOO test.db" ""
  } {0 {}}
  do_test shell1-1.3.2 {
 -  catchcmd "-init FOO test.db .quit BAD" ""
 -} {0 {}}
 +  catchcmdex "-init FOO test.db .quit BAD" ""
- } {0 {}}
++} {1 {child process exited abnormally}}
  do_test shell1-1.3.3 {
    catchcmd "-init FOO test.db BAD .quit" ""
  } {/1 .Error: in prepare, near "BAD": syntax error (1)*/}
diff --cc test/shell2.test
index 8a6e5a217a,6b4dff515e..6f59507acf
--- a/test/shell2.test
+++ b/test/shell2.test
@@@ -63,8 -63,10 +63,8 @@@ do_test shell2-1.3 
  
      UPDATE OR REPLACE t5 SET a = 4 WHERE a = 1;
    }
- } {1 {Error: near line 9: in stepping, too many levels of trigger recursion (1)}}
+ } {1 {Error: near line 9: stepping, too many levels of trigger recursion (1)}}
  
 -
 -
  # Shell not echoing all commands with echo on.
  # Ticket [eb620916be].