Remove an ALWAYS() that is no longer always true.

FossilOrigin-Name: c95823cd451f7721174393817a801403647467db

diff --git a/manifest b/manifest
index dae060c0f8fca94f23a7fe1b499cd55c4ccd3fac..ddbc25013852693643c74c6dac0f64f7cfbe024c 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fixes\sso\sthat\sSQLITE_OMIT_CTE\sbuilds\swork.
-D 2014-01-15T19:42:23.894
+C Remove\san\sALWAYS()\sthat\sis\sno\slonger\salways\strue.
+D 2014-01-15T20:10:15.729
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 2ef13430cd359f7b361bb863504e227b25cc7f81
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -219,7 +219,7 @@ F src/printf.c 85d07756e45d7496d19439dcae3e6e9e0090f269
 F src/random.c d10c1f85b6709ca97278428fd5db5bbb9c74eece
 F src/resolve.c ae278d8ce037883323f677e78c241f64289f12ec
 F src/rowset.c 64655f1a627c9c212d9ab497899e7424a34222e0
-F src/select.c b55e726c8dff607790038bf41e6d47925a832b14
+F src/select.c ab437f252415754963b1adfa501120d5364da3ef
 F src/shell.c a3541193d5fce37e91dad8ef46a9505aa7c9b344
 F src/sqlite.h.in d94a8b89522f526ba711182ee161e06f8669bcc9
 F src/sqlite3.rc 11094cc6a157a028b301a9f06b3d03089ea37c3e
@@ -1150,7 +1150,7 @@ F tool/vdbe-compress.tcl 0cf56e9263a152b84da86e75a5c0cdcdb7a47891
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh d1a6de74685f360ab718efda6265994b99bbea01
 F tool/win/sqlite.vsix 030f3eeaf2cb811a3692ab9c14d021a75ce41fff
-P c948384dfdd9f68a832d5a452af44f35337f66e7
-R 366ade7d6e8c82851813f265ff0c51f5
-U dan
-Z a6417c60f97c097fa8d751079d1185b1
+P 3908e2ea2e7e5f466cbbbffdc27e0fe8dc9751ac
+R ec33026d9a1a4e4ae1384253da1cbe65
+U drh
+Z d40f91394b02fb8b902b74395abcc185

diff --git a/manifest.uuid b/manifest.uuid
index cab35f439489a666512bfd492174750429d33db6..d95e8d3935c11ae7aa6c55a86260cf991f1093f3 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-3908e2ea2e7e5f466cbbbffdc27e0fe8dc9751ac
\ No newline at end of file
+c95823cd451f7721174393817a801403647467db
\ No newline at end of file

diff --git a/src/select.c b/src/select.c
index 7f20dc689adda142ab38d14fd51a0e55714bdf7d..b4ce7be9ed0cfbe2f221206b347ef859d6b0540b 100644 (file)
--- a/src/select.c
+++ b/src/select.c
@@ -1217,7 +1217,7 @@ static const char *columnTypeImpl(
           sNC.pParse = pNC->pParse;
           zType = columnType(&sNC, p,&zOrigDb,&zOrigTab,&zOrigCol, &estWidth); 
         }
-      }else if( ALWAYS(pTab->pSchema) ){
+      }else if( pTab->pSchema ){
         /* A real table */
         assert( !pS );
         if( iCol<0 ) iCol = pTab->iPKey;