]> git.ipfire.org Git - thirdparty/sqlite.git/commitdiff
Merge the latest trunk fixes and enhancements into the right-join branch.
authordrh <>
Mon, 2 May 2022 15:10:38 +0000 (15:10 +0000)
committerdrh <>
Mon, 2 May 2022 15:10:38 +0000 (15:10 +0000)
FossilOrigin-Name: afbcf075c1e09ae064c7b16e63501cd1d374711812664aef76bd35d02d64a2b6

1  2 
manifest
manifest.uuid
src/expr.c
src/sqliteInt.h
src/treeview.c

diff --cc manifest
index ee8227b22f4f35e146a4ce92e39b8ec6aa7b3106,3e37826c15d64c876958beeb9e1225c20845b3ba..7b19f35a1b4a0af03000dfb0b9f7461c856112ee
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Show\sthe\sUSING\sclause\sas\spart\sof\sthe\stree-view\sdisplay\sof\sSrcItem.
- D 2022-04-29T17:03:25.685
 -C Improvement\son\scheck-in\s[a193749730d6cfba]\sso\sthat\sthe\ssubroutine\scall\sto\nthe\sIN\soperator\sright-hand\sside\sgenerator\sfrom\sthe\sRIGHT\sJOIN\sno-match\slogic\ndoes\snot\sgenerate\sunreachable\sbyte\scode.
 -D 2022-05-02T14:32:56.242
++C Merge\sthe\slatest\strunk\sfixes\sand\senhancements\sinto\sthe\sright-join\sbranch.
++D 2022-05-02T15:10:38.366
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@@ -504,7 -504,7 +504,7 @@@ F src/date.c 15082566229d4b1e5f24fdb490
  F src/dbpage.c 90661a87e1db8bfbc8d2ebbdcd3749651ddb287c555c07a28fb17c7c591ffb68
  F src/dbstat.c 861e08690fcb0f2ee1165eff0060ea8d4f3e2ea10f80dab7d32ad70443a6ff2d
  F src/delete.c a8e844af211a48b13b5b358be77a12c860c6a557c21990ad51a548e2536500ce
- F src/expr.c 132e30b849d7b3b8afbd61635a5c0365b3e5ae8dd39faa920b26b5e7eb46345d
 -F src/expr.c 36acab0dde36ab805ed9c793c9a2bb864793999c8b4d4b0e758100eb0339b124
++F src/expr.c efa37babe35dcf79933beb9df3aee0c6a2f60ac56645773c73c866fd9894d938
  F src/fault.c 460f3e55994363812d9d60844b2a6de88826e007
  F src/fkey.c d965ede15d8360c09ed59348940649ee647b192e784466837d7aefa836d1d91e
  F src/func.c a3407a6fbb0d4088d8d502e46f0ace63e0aeae7467ae23a9ca9815bbf9239761
@@@ -558,7 -558,7 +558,7 @@@ F src/shell.c.in ae0a6fae983caac6f8c824
  F src/sqlite.h.in 2a35f62185eb5e7ecc64a2f68442b538ce9be74f80f28a00abc24837edcf1c17
  F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
  F src/sqlite3ext.h f49e28c25bd941e79794db5415fdf7b202deb3bc072ed6f1ed273d578703684e
- F src/sqliteInt.h 453038c918b337a708a73106cf51bdce5aa442ec705854449dba94832eafd5e5
 -F src/sqliteInt.h b076cfab9455b6ef1245667ff73dada79a204c750985f788e52469727f0d1c31
++F src/sqliteInt.h 3aaaf14804c77feadfd2ee241bb7e9ca4aa5be5cacddab8f9f7f2e8190a0c5b2
  F src/sqliteLimit.h d7323ffea5208c6af2734574bae933ca8ed2ab728083caa117c9738581a31657
  F src/status.c 4a3da6d77eeb3531cb0dbdf7047772a2a1b99f98c69e90ce009c75fe6328b2c0
  F src/table.c 0f141b58a16de7e2fbe81c308379e7279f4c6b50eb08efeec5892794a0ba30d1
@@@ -618,7 -618,7 +618,7 @@@ F src/test_window.c cdae419fdcea5bad6dc
  F src/test_wsd.c 41cadfd9d97fe8e3e4e44f61a4a8ccd6f7ca8fe9
  F src/threads.c 4ae07fa022a3dc7c5beb373cf744a85d3c5c6c3c
  F src/tokenize.c a38f52058b517929e264094abd0b5fd1e8e145a1aa43bc6f6a72ae5218f96c98
- F src/treeview.c 06fbe7bcd8703ff037c831251ca197c3e39801a2d4c75a278581413ec52b2bdd
 -F src/treeview.c a47e4246396118f3d5a1c524de15e6fffaf02036be192d4339e887a2a9bf36b1
++F src/treeview.c 5c2a8d3bc6c91c3108cc63beba7b04ec5f2fdaefd1a2dc534fb4ef8f4a1d588a
  F src/trigger.c 372ada38f667c6823a3db15749eb668338e65c793394e55a37e56a489f2d1b55
  F src/update.c 2cfaded82ca80ff56afb8c3ae5e88284e0824bfd86119827cc22481959f96f92
  F src/upsert.c 8789047a8f0a601ea42fa0256d1ba3190c13746b6ba940fe2d25643a7e991937
@@@ -1952,8 -1951,8 +1952,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 3aafccb5c3c780c29090ee5eb428a6c3153627ce8bf834bbd392e79a30e9389b
- R 8943973edba9ba4c2b994eff77854a7b
 -P 40f3274745b53bb72933c1052d0e85bc74be56d3a1068e9d54dc28763a2cfef9
 -R fa255f48eb3059bbcc1be1195343e4b6
++P 9cba3ce577e442f83d7a2d6926e38ffe6bc45953c88ecdd384f3455890303cce cc458317bd77046c4328715ae9e3409f3f4cd422a01162cb33405ef3a142b0a3
++R 8c6adc25dedee0141892e4be83329645
  U drh
- Z ac8b1738cb42dc17aee412492b492bec
 -Z e6ffd1955bb698b867fb285f4218f7e4
++Z 8ddd04e8896d9f6869b3f2d45984a6f1
  # Remove this line to create a well-formed Fossil manifest.
diff --cc manifest.uuid
index 80c0be0c0854d166ab0dd7c9de0fc9fa1be3e450,15adbbe53c7f90f944875bf990175fd4816d60d2..cef5ace71e2efaab5744c3c0ad5ef1db90538f34
@@@ -1,1 -1,1 +1,1 @@@
- 9cba3ce577e442f83d7a2d6926e38ffe6bc45953c88ecdd384f3455890303cce
 -cc458317bd77046c4328715ae9e3409f3f4cd422a01162cb33405ef3a142b0a3
++afbcf075c1e09ae064c7b16e63501cd1d374711812664aef76bd35d02d64a2b6
diff --cc src/expr.c
Simple merge
diff --cc src/sqliteInt.h
Simple merge
diff --cc src/treeview.c
Simple merge