From: dan <dan@noemail.net>
Date: Mon, 17 Sep 2018 13:38:45 +0000 (+0000)
Subject: Minor modification to the fix on this branch to avoid adding extra conditional
X-Git-Tag: version-3.26.0~151^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=de79e094bc1a804862e9766f70976fc4c4e97d3a;p=thirdparty%2Fsqlite.git

Minor modification to the fix on this branch to avoid adding extra conditional
compilation macros.

FossilOrigin-Name: 4d8be404dab265b51e5a6a95e83be85c22512e19a437191690c7d845c87ff259
---

diff --git a/manifest b/manifest
index de77e631f8..6a164c052c 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\sextra\stest\sfor\sthe\sfix\son\sthis\sbranch.\sAlso\sfix\sa\npointer-compare-after-free\sproblem\sthat\soccurs\sin\ssimilar\scases.
-D 2018-09-17T08:27:23.927
+C Minor\smodification\sto\sthe\sfix\son\sthis\sbranch\sto\savoid\sadding\sextra\sconditional\ncompilation\smacros.
+D 2018-09-17T13:38:45.679
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F Makefile.in 01e95208a78b57d056131382c493c963518f36da4c42b12a97eb324401b3a334
@@ -436,7 +436,7 @@ F spec.template 86a4a43b99ebb3e75e6b9a735d5fd293a24e90ca
 F sqlite.pc.in 42b7bf0d02e08b9e77734a47798d1a55a9e0716b
 F sqlite3.1 fc7ad8990fc8409983309bb80de8c811a7506786
 F sqlite3.pc.in 48fed132e7cb71ab676105d2a4dc77127d8c1f3a
-F src/alter.c 3800f24c922dfcab2e7a05b49123e2f9c903c26fccea71a5f9ac765e91949355
+F src/alter.c 2269dd2f37ba963fde4c51e9e83542f126c86a8e10357c17f48137c6bee5299b
 F src/analyze.c 3dc6b98cf007b005af89df165c966baaa48e8124f38c87b4d2b276fe7f0b9eb9
 F src/attach.c 4bd5b92633671d3e8ce431153ebb1893b50335818423b5373f3f27969f79769a
 F src/auth.c 32a5bbe3b755169ab6c66311c5225a3cd4f75a46c041f7fb117e0cbb68055114
@@ -500,7 +500,7 @@ F src/pragma.h bb83728944b42f6d409c77f5838a8edbdb0fe83046c5496ffc9602b40340a324
 F src/prepare.c f8e260d940a0e08494c0f30744521b2f832d7263eca9d02b050cea0ba144b097
 F src/printf.c 0f1177cf1dd4d7827bf64d840768514ec76409abecaca9e8b577dbd065150381
 F src/random.c 80f5d666f23feb3e6665a6ce04c7197212a88384
-F src/resolve.c c32f4c9473207e0434489582161867e92548128492112e756d5b0dd248567bfe
+F src/resolve.c 4928a63b6abf6baa94efc5375004196fc8b704d4f036a4cce6e4f2e07f53c4b5
 F src/rowset.c d977b011993aaea002cab3e0bb2ce50cf346000dff94e944d547b989f4b1fe93
 F src/select.c ed6192ddd09a97169cb1c6d732b26c0f647b72d5fa8ca401c7ee1180fbbe521a
 F src/shell.c.in 6e0aad854be738a5d0368940459399be211e9ac43aebe92bb9ed46cfe38d0e1f
@@ -1766,7 +1766,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 b12f23a5c484cab3654721299ea0f05230eef6b14012b557f3bf2592fac0f00e
-R fdc93ad4d417c5a17eda517310446c18
+P 1856ea63b3186c2c8fa716ffe01c731397bdbbc3fbb56dc72ad0686cb7f152ca
+R 6e72766cd421e67b35e1efbd11675502
 U dan
-Z 0a0cf7b3375e76f2b517ca3739e2db01
+Z 8ad44f59cac49311751e10cb991dd243
diff --git a/manifest.uuid b/manifest.uuid
index 8e6555a42b..e3891237b7 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-1856ea63b3186c2c8fa716ffe01c731397bdbbc3fbb56dc72ad0686cb7f152ca
\ No newline at end of file
+4d8be404dab265b51e5a6a95e83be85c22512e19a437191690c7d845c87ff259
\ No newline at end of file
diff --git a/src/alter.c b/src/alter.c
index c33dfdfb85..08745ccee2 100644
--- a/src/alter.c
+++ b/src/alter.c
@@ -1076,7 +1076,7 @@ static int renameResolveTrigger(Parse *pParse, const char *zDb){
       Table *pTarget = sqlite3LocateTable(pParse, 0, pStep->zTarget, zDb);
       if( pTarget==0 ){
         rc = SQLITE_ERROR;
-      }else{
+      }else if( SQLITE_OK==(rc = sqlite3ViewGetColumnNames(pParse, pTarget)) ){
         SrcList sSrc;
         memset(&sSrc, 0, sizeof(sSrc));
         sSrc.nSrc = 1;
diff --git a/src/resolve.c b/src/resolve.c
index b10843ca09..d5c4b42ada 100644
--- a/src/resolve.c
+++ b/src/resolve.c
@@ -240,12 +240,6 @@ static int lookupName(
       for(i=0, pItem=pSrcList->a; i<pSrcList->nSrc; i++, pItem++){
         pTab = pItem->pTab;
         assert( pTab!=0 && pTab->zName!=0 );
-        if( pTab->nCol==0 ){
-          assert( pParse->eParseMode==PARSE_MODE_RENAME_COLUMN
-               || pParse->eParseMode==PARSE_MODE_RENAME_TABLE );
-          assert( pNC->pParse==pParse );
-          if( sqlite3ViewGetColumnNames(pParse, pTab) ) return WRC_Abort;
-        }
         if( pItem->pSelect && (pItem->pSelect->selFlags & SF_NestedFrom)!=0 ){
           int hit = 0;
           pEList = pItem->pSelect->pEList;