Remove redundant code resulting from a merge error on the previous check-in.

FossilOrigin-Name: 713fe86b8c9f3c9ef8af952019e99ba2f4741326226264de6a66baaeb1803d2a

diff --git a/manifest b/manifest
index 8fac97f608d7a8ae96ed944228295ff341875d32..c4de10d00052b53ea90124542532bc9d795d633c 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\ssupport\sfor\sgenerated\scolumns.
-D 2019-10-26T18:47:47.117
+C Remove\sredundant\scode\sresulting\sfrom\sa\smerge\serror\son\sthe\sprevious\scheck-in.
+D 2019-10-26T18:56:12.322
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -487,7 +487,7 @@ F src/hash.c 8d7dda241d0ebdafb6ffdeda3149a412d7df75102cecfc1021c98d6219823b19
 F src/hash.h 9d56a9079d523b648774c1784b74b89bd93fac7b365210157482e4319a468f38
 F src/hwtime.h 747c1bbe9df21a92e9c50f3bbec1de841dc5e5da
 F src/in-operator.md 10cd8f4bcd225a32518407c2fb2484089112fd71
-F src/insert.c 948bbd90277450f8d4f9ba4b881dd6676023d9e8bad56228064184dc85011cca
+F src/insert.c 00f36e4061c4e85ff63ba3dc3ccffe6a53ab4013f090d64061584f414dbf9efe
 F src/legacy.c d7874bc885906868cd51e6c2156698f2754f02d9eee1bae2d687323c3ca8e5aa
 F src/loadext.c 4ddc65ae13c0d93db0ceedc8b14a28c8c260513448b0eb8c5a2ac375e3b6a85d
 F src/main.c 3e01f6a1c96643381b5f9d79e4ff7f2520bc5712197746fb0852283e78cccf66
@@ -1848,8 +1848,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P e3c3f4d7872f431a95627d52553101388c1e39458cc7e7f93fc81255f49a89a5 4ec57d88415fa4ea2e99d4a5671074ec6829d6824bc8509d5ae9c978d47d1419
-R f145bc7e6a3c49b3acdcdeb1a4214a2e
-T +closed 4ec57d88415fa4ea2e99d4a5671074ec6829d6824bc8509d5ae9c978d47d1419
+P b855acf1831943b3914491ed0bc333131321930cab480a5281012a3aebbba492
+R 0a3a520f870448808e97b5392bf1f816
 U drh
-Z 906ad86e78e219feca2ac3d876e5c4a1
+Z ae64f236a7851596712eed7ea9b59b3e

diff --git a/manifest.uuid b/manifest.uuid
index f10065993b54156686da97b9f2ca10c6f7e4d233..690740748c4b8ed037001062d2cea1df85aada59 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-b855acf1831943b3914491ed0bc333131321930cab480a5281012a3aebbba492
\ No newline at end of file
+713fe86b8c9f3c9ef8af952019e99ba2f4741326226264de6a66baaeb1803d2a
\ No newline at end of file

diff --git a/src/insert.c b/src/insert.c
index afec78b46904d894b2a479e30c6b648eac28022f..806e285131bcb1d027ee38a52326b2f537c5a36e 100644 (file)
--- a/src/insert.c
+++ b/src/insert.c
@@ -1497,8 +1497,6 @@ void sqlite3GenerateConstraintChecks(
         /* Don't bother checking for NOT NULL on columns that do not change */
         continue;
       }
-      onError = pTab->aCol[i].notNull;
-      if( onError==OE_None ) continue;  /* This column is allowed to be NULL */
       if( overrideError!=OE_Default ){
         onError = overrideError;
       }else if( onError==OE_Default ){