From: drh <drh@noemail.net>
Date: Tue, 3 Oct 2017 17:17:34 +0000 (+0000)
Subject: Remove an unused variable from sqlite3Insert() and fix harmless
X-Git-Tag: version-3.21.0~41
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ce2c482e5a3876c7ad9f594ef3f771e2ca24b058;p=thirdparty%2Fsqlite.git

Remove an unused variable from sqlite3Insert() and fix harmless
compiler warnings associated with -DSQLITE_MUTATION_TEST.

FossilOrigin-Name: 7be760e907274131bcd4acfaff9e72c9c59a05e7d411db3d9afe690fe0d64b4b
---

diff --git a/manifest b/manifest
index 0026fbbe1f..64e4df70a2 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sthe\ssqlite3_column_decltype()\sinterface\sto\sreturn\sthe\scorrect\sdatatype\nwhen\sthe\svalue\scomes\sthrough\sa\sCTE.
-D 2017-10-03T16:57:33.183
+C Remove\san\sunused\svariable\sfrom\ssqlite3Insert()\sand\sfix\sharmless\ncompiler\swarnings\sassociated\swith\s-DSQLITE_MUTATION_TEST.
+D 2017-10-03T17:17:34.912
 F Makefile.in 4bc36d913c2e3e2d326d588d72f618ac9788b2fd4b7efda61102611a6495c3ff
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc 6033b51b6aea702ea059f6ab2d47b1d3cef648695f787247dd4fb395fe60673f
@@ -420,10 +420,10 @@ F src/hash.c a12580e143f10301ed5166ea4964ae2853d3905a511d4e0c44497245c7ce1f7a
 F src/hash.h ab34c5c54a9e9de2e790b24349ba5aab3dbb4fd4
 F src/hwtime.h 747c1bbe9df21a92e9c50f3bbec1de841dc5e5da
 F src/in-operator.md 10cd8f4bcd225a32518407c2fb2484089112fd71
-F src/insert.c d2d1bf12d2b5382450620d7cede84c7ffe57e6a89fa9a908f1aba68df2731cd9
+F src/insert.c 1f33ef4ca0553b60fff03aa171370f8709a3e945acfcc68ccafc92752d872f40
 F src/legacy.c 134ab3e3fae00a0f67a5187981d6935b24b337bcf0f4b3e5c9fa5763da95bf4e
 F src/loadext.c 20865b183bb8a3723d59cf1efffc3c50217eb452c1021d077b908c94da26b0b2
-F src/main.c 1c2307a9f7e3183232a2d049881026fe43bf25659857cc11a9a44898accd3200
+F src/main.c 556a0942bdab9cd33f75aaec4adf54cc008898cb73b9657337be5960c7bcac8f
 F src/malloc.c a02c9e69bc76bee0f639416b947a946412890b606301454727feadcb313536d6
 F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
 F src/mem1.c c12a42539b1ba105e3707d0e628ad70e611040d8f5e38cf942cee30c867083de
@@ -458,7 +458,7 @@ F src/printf.c 40aee47ae9be4bd3dbdc8968bd07fddc027be8edec8daddf24d3391d36698a1c
 F src/random.c 80f5d666f23feb3e6665a6ce04c7197212a88384
 F src/resolve.c 4324a94573b1e29286f8121e4881db59eaedc014afeb274c8d3e07ed282e0e20
 F src/rowset.c 7b7e7e479212e65b723bf40128c7b36dc5afdfac
-F src/select.c cb912fc73ee6dd404acdee580ee3bcea593e6b1f068c539d4298b7010e664c61
+F src/select.c 52f5ef16847ace5f44cb05474b18aa168ce4191ab216f1faaeb27100c588933a
 F src/shell.c c1206a23d9239f8f51751d3be9b8c3b02fa4103546bea1add7f864d84a8276ab
 F src/shell.c.in bb9720a8c5c98d3984b16ab7540e7142bcae959666ecf248bfc523a1d44220ee
 F src/sqlite.h.in ab4f8a29d1580dfaeb6891fa1b83cff8229ba0daa56994707ceaca71495d9ab7
@@ -1655,7 +1655,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 c5ad5e1675f6cb5a54df21606dfec2198a7cf88acc529460ebe27bdab128a6e5
-R 4e08b893abd2a9bcdfb81ab1fd1cc1bd
+P 966438bd259ade3a2d4a6ec9587ce79c81a21b942248bffb389995b9132b53e3
+R ffa559a096a20092f6ad3c894c3f67a3
 U drh
-Z 94cd089961159ef74793b517e37fdcdc
+Z 7ef5ddb828d35332c3570a426acb47a9
diff --git a/manifest.uuid b/manifest.uuid
index 42b7a639a2..1780765a08 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-966438bd259ade3a2d4a6ec9587ce79c81a21b942248bffb389995b9132b53e3
\ No newline at end of file
+7be760e907274131bcd4acfaff9e72c9c59a05e7d411db3d9afe690fe0d64b4b
\ No newline at end of file
diff --git a/src/insert.c b/src/insert.c
index f8e9095ea5..5da52e7692 100644
--- a/src/insert.c
+++ b/src/insert.c
@@ -484,7 +484,6 @@ void sqlite3Insert(
 ){
   sqlite3 *db;          /* The main database structure */
   Table *pTab;          /* The table to insert into.  aka TABLE */
-  char *zTab;           /* Name of the table into which we are inserting */
   int i, j;             /* Loop counters */
   Vdbe *v;              /* Generate code into this virtual machine */
   Index *pIdx;          /* For looping over indices of the table */
@@ -540,8 +539,6 @@ void sqlite3Insert(
   /* Locate the table into which we will be inserting new information.
   */
   assert( pTabList->nSrc==1 );
-  zTab = pTabList->a[0].zName;
-  if( NEVER(zTab==0) ) goto insert_cleanup;
   pTab = sqlite3SrcListLookup(pParse, pTabList);
   if( pTab==0 ){
     goto insert_cleanup;
diff --git a/src/main.c b/src/main.c
index 6f697ffb39..082b96f960 100644
--- a/src/main.c
+++ b/src/main.c
@@ -3711,7 +3711,7 @@ int sqlite3_test_control(int op, ...){
     ** This action provides a run-time test to see how the ALWAYS and
     ** NEVER macros were defined at compile-time.
     **
-    ** The return value is ALWAYS(X).  
+    ** The return value is ALWAYS(X) if X is true, or 0 if X is false.
     **
     ** The recommended test is X==2.  If the return value is 2, that means
     ** ALWAYS() and NEVER() are both no-op pass-through macros, which is the
@@ -3734,7 +3734,7 @@ int sqlite3_test_control(int op, ...){
     */
     case SQLITE_TESTCTRL_ALWAYS: {
       int x = va_arg(ap,int);
-      rc = ALWAYS(x);
+      rc = x ? ALWAYS(x) : 0;
       break;
     }
 
diff --git a/src/select.c b/src/select.c
index 75ba752d4c..c279472f33 100644
--- a/src/select.c
+++ b/src/select.c
@@ -412,11 +412,10 @@ static int sqliteProcessJoin(Parse *pParse, Select *p){
   pLeft = &pSrc->a[0];
   pRight = &pLeft[1];
   for(i=0; i<pSrc->nSrc-1; i++, pRight++, pLeft++){
-    Table *pLeftTab = pLeft->pTab;
     Table *pRightTab = pRight->pTab;
     int isOuter;
 
-    if( NEVER(pLeftTab==0 || pRightTab==0) ) continue;
+    if( NEVER(pLeft->pTab==0 || pRightTab==0) ) continue;
     isOuter = (pRight->fg.jointype & JT_OUTER)!=0;
 
     /* When the NATURAL keyword is present, add WHERE clause terms for