Merge the WITHOUT ROWID, NOT NULL ON CONFLICT bug fix into the strict-tables

branch.

FossilOrigin-Name: 7ee01ee47da247a80bcf16f88eb187b8c0928024536435ed20797a1a90495511

diff --cc manifest
index b57c86b471592f778129d2da898c2dfdce0cac66,6e4b8ae466dacdb8fd0ca382a151f2b635604bb6..6a19c5a17074156e2516bbdee6881f9d9126b530
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Trying\sto\sinsert\san\sincorrect\sdatatype\sinto\sa\sSTRICT\stable\sraises\san\nSQLITE_CONSTRAINT_DATATYPE\serror.\s\sSeems\sto\swork,\sthough\slots\smore\stesting\nis\sneeded.
- D 2021-08-18T19:22:27.620
 -C Fix\sON\sCONFLICT\sclause\sprocessing\sfor\sNOT\sNULL\sconstraints\sof\sPRIMARY\sKEY\ncolumns\son\sWITHOUT\sROWID\stables.\nTicket\s[f2be158c57aaa8c6]
 -D 2021-08-18T22:26:51.356
++C Merge\sthe\sWITHOUT\sROWID,\sNOT\sNULL\sON\sCONFLICT\sbug\sfix\sinto\sthe\sstrict-tables\nbranch.
++D 2021-08-18T23:00:43.920
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@@ -488,7 -488,7 +488,7 @@@ F src/btmutex.c 8acc2f464ee76324bf13310
  F src/btree.c e204a9c8fb4fe5dbb910a863ba487f4af9b5c501254ec4ccbfcdd6b1f65b7fb4
  F src/btree.h 74d64b8f28cfa4a894d14d4ed64fa432cd697b98b61708d4351482ae15913e22
  F src/btreeInt.h 7bc15a24a02662409ebcd6aeaa1065522d14b7fda71573a2b0568b458f514ae0
- F src/build.c bf8b4f6f4fb9620eedadaa9513a2682b9ff80c643285f56d9ea34105dc3c2e2b
 -F src/build.c 69cddb20437f5608d026409281a3f6b8064d324d009bd22eb6acba4202e38770
++F src/build.c 25adabcbe538ce25c577c3f6815c0a83c483a700984d784a69ed6883cbbd7a98
  F src/callback.c d0b853dd413255d2e337b34545e54d888ea02f20da5ad0e63585b389624c4a6c
  F src/complete.c a3634ab1e687055cd002e11b8f43eb75c17da23e
  F src/ctime.c 8159d5f706551861c18ec6c8f6bdf105e15ea00367f05d9ab65d31a1077facc1
@@@ -1921,7 -1920,7 +1921,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 78732b9f98936693ae29c85a692c35a84c7d065aec79903af34b08d18f10a5e6
- R 1fff96359c6ac1b1e05dcf91c71ba789
 -P b9b0dcd5af072c22f2ce71cf9584b5b572fbcfbce6410a7d703b586adb8938ba
 -R f57d6ed5153ac1a3784cf20c59f627b9
++P a19305e5cfedf5c472200d6e05c1396443e348f052a40a0979f860f2ff06851d 13abba0941a724eb62455650976b03678e4455b6b3090c84a2ab2f4a7656b4d8
++R fda99db412e4d20b77fa444be1944106
  U drh
- Z 89d8d7739872c2c88b7cdfc8d1469967
 -Z 19e6156db8fe8743846e026420e0b856
++Z 59e849481af66370dc20d95e87531af1

diff --cc manifest.uuid
index 0b2954cae8552c994e600d2a83a7f5d2d4b862a2,e76a74f795aac54d8c5da02126a19f479779a375..33b9ab83f7728436f2526eec034807d324858f7c
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- a19305e5cfedf5c472200d6e05c1396443e348f052a40a0979f860f2ff06851d
 -13abba0941a724eb62455650976b03678e4455b6b3090c84a2ab2f4a7656b4d8
++7ee01ee47da247a80bcf16f88eb187b8c0928024536435ed20797a1a90495511

diff --cc src/build.c
Simple merge