From: drh <drh@noemail.net>
Date: Fri, 14 Apr 2017 12:27:45 +0000 (+0000)
Subject: Remove an incorrect ALWAYS().
X-Git-Tag: version-3.19.0~63
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7c88bcd473dbc96bc3147e10dbe4b7932c4cb3bb;p=thirdparty%2Fsqlite.git

Remove an incorrect ALWAYS().

FossilOrigin-Name: f956f6ae6b0863c70c4a2b227338d5c332e87f2ec6f3fcdf2233c14c5b78ca2b
---

diff --git a/manifest b/manifest
index 732075dd2a..9ba1b45229 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Reinstate\sthe\sSQLITE_API\squalifier\son\sthe\ssqlite3_delete_database()\smethod\sin\ntest_delete.c.\sAccidentally\sremoved\sby\sthe\sprevious\scommit.
-D 2017-04-13T15:51:27.697
+C Remove\san\sincorrect\sALWAYS().
+D 2017-04-14T12:27:45.370
 F Makefile.in 1cc758ce3374a32425e4d130c2fe7b026b20de5b8843243de75f087c0a2661fb
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc a4c0613a18663bda56d8cf76079ab6590a7c3602e54befb4bbdef76bcaa38b6a
@@ -401,7 +401,7 @@ F src/printf.c 8757834f1b54dae512fb25eb1acc8e94a0d15dd2290b58f2563f65973265adb2
 F src/random.c 80f5d666f23feb3e6665a6ce04c7197212a88384
 F src/resolve.c 3e518b962d932a997fae373366880fc028c75706
 F src/rowset.c 7b7e7e479212e65b723bf40128c7b36dc5afdfac
-F src/select.c e6f9afd8a5ef35bd186e51a6bea6d3d46bc93a530f26a21fe8a0a43dbeca9415
+F src/select.c cc9129bc97d20f3c79b9dfcc555db37eed28a660cc6954bf3b282d8e1e5593a2
 F src/shell.c 70f4957b988572315e97c56941fdc81fd35907fee36b7b2e7be5ec4c7e9d065d
 F src/sqlite.h.in 40233103e3e4e10f8a63523498d0259d232e42aba478e2d3fb914799185aced6
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
@@ -1571,7 +1571,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 fa9bb7b768027677f7e7d5a196ba5b245dfc8d8986ccd101c8dab671bd15719d
-R a3ef8c76f5c2f7b3a154992d233a97da
-U dan
-Z d716c1706cce68fcc2a1217c8e02d65a
+P 59c70108fd179932ccdd860f93e1cd68b77476d3b1af1af00cf6e378c9984862
+R c91754472255c67faea0aa47fea74aba
+U drh
+Z 5034d642c46b4ea39fd9a8ac97c67432
diff --git a/manifest.uuid b/manifest.uuid
index a5dc30585a..924660ea40 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-59c70108fd179932ccdd860f93e1cd68b77476d3b1af1af00cf6e378c9984862
\ No newline at end of file
+f956f6ae6b0863c70c4a2b227338d5c332e87f2ec6f3fcdf2233c14c5b78ca2b
\ No newline at end of file
diff --git a/src/select.c b/src/select.c
index 54265ab2a9..3c35c75041 100644
--- a/src/select.c
+++ b/src/select.c
@@ -1690,7 +1690,7 @@ int sqlite3ColumnsFromExprList(
         pColExpr = pColExpr->pRight;
         assert( pColExpr!=0 );
       }
-      if( pColExpr->op==TK_COLUMN && ALWAYS(pColExpr->pTab!=0) ){
+      if( pColExpr->op==TK_COLUMN && pColExpr->pTab!=0 ){
         /* For columns use the column name name */
         int iCol = pColExpr->iColumn;
         pTab = pColExpr->pTab;