From: drh <>
Date: Fri, 27 May 2022 17:36:21 +0000 (+0000)
Subject: Minor simplification to ALTER TABLE logic.
X-Git-Tag: version-3.39.0~85
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=abe1ff38dd9bf840bd43b45b2b842642484ee8d7;p=thirdparty%2Fsqlite.git

Minor simplification to ALTER TABLE logic.

FossilOrigin-Name: 01beb0365c529481605f1864b1b6760e2484fad08d56a72e00e34acff37e23f8
---

diff --git a/manifest b/manifest
index 15f7127c15..b288ab3fe6 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Corrected\sa\sbroken\sHTML\scomment\s(was\susing\sa\sC-style\scomment\scloser).
-D 2022-05-27T17:13:56.268
+C Minor\ssimplification\sto\sALTER\sTABLE\slogic.
+D 2022-05-27T17:36:21.337
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -500,7 +500,7 @@ F spec.template 86a4a43b99ebb3e75e6b9a735d5fd293a24e90ca
 F sqlite.pc.in 42b7bf0d02e08b9e77734a47798d1a55a9e0716b
 F sqlite3.1 fc7ad8990fc8409983309bb80de8c811a7506786
 F sqlite3.pc.in 48fed132e7cb71ab676105d2a4dc77127d8c1f3a
-F src/alter.c d8671d56a89123dfeb517efbd580043a67b5859a615c31745f533567fd42e69b
+F src/alter.c 0390ca1d69ec3626cfa9f153114b7ab233e6b2bada6a9eb91361ed385fe90deb
 F src/analyze.c aabdf3769c7fd9954a8ec508eb7041ae174b66f88d12c47199fabbea9a646467
 F src/attach.c 4431f82f0247bf3aaf91589acafdff77d1882235c95407b36da1585c765fbbc8
 F src/auth.c f4fa91b6a90bbc8e0d0f738aa284551739c9543a367071f55574681e0f24f8cf
@@ -1970,8 +1970,8 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 33cf12235e6469ba17cfb72cef0e480dfd0dea81ed412fb1fb24b05dbeb8dc02
-R 0185d9a66db4bbbf377e87a775a5273a
-U stephan
-Z e1db3e85707eb265e716816de954de27
+P db742e3e7d1caeff8d9df1d86abf54fcb2f2263db7a433ffacf3cd3777e533c5
+R 9f5bbbd598c3c632a4687a11d52f0b0c
+U drh
+Z bcb40d0c984d7fab2c03d3331d81ea89
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 242c16a9f6..0fa9a0e804 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-db742e3e7d1caeff8d9df1d86abf54fcb2f2263db7a433ffacf3cd3777e533c5
\ No newline at end of file
+01beb0365c529481605f1864b1b6760e2484fad08d56a72e00e34acff37e23f8
\ No newline at end of file
diff --git a/src/alter.c b/src/alter.c
index 9ccab37c78..d8a9982873 100644
--- a/src/alter.c
+++ b/src/alter.c
@@ -1333,7 +1333,6 @@ static int renameResolveTrigger(Parse *pParse){
           pSel->pSrc = 0;
           sqlite3SelectDelete(db, pSel);
         }
-        
         if( pStep->pFrom ){
           int i;
           for(i=0; i<pStep->pFrom->nSrc && rc==SQLITE_OK; i++){
@@ -1344,7 +1343,7 @@ static int renameResolveTrigger(Parse *pParse){
           }
         }
 
-        if( rc==SQLITE_OK && db->mallocFailed ){
+        if(  db->mallocFailed ){
           rc = SQLITE_NOMEM;
         }
         sNC.pSrcList = pSrc;