Index: src/select.c
==================================================================
--- src/select.c
+++ src/select.c
@@ -2084,12 +2084,14 @@
   Table *pTab;
   sqlite3 *db = pParse->db;
   u64 savedFlags;
 
   savedFlags = db->flags;
-  db->flags &= ~(u64)SQLITE_FullColNames;
-  db->flags |= SQLITE_ShortColNames;
+  if( (db->flags & SQLITE_FullColNames)!=0 ){
+    db->flags &= ~(u64)SQLITE_FullColNames;
+    db->flags |= SQLITE_ShortColNames;
+  }
   sqlite3SelectPrep(pParse, pSelect, 0);
   db->flags = savedFlags;
   if( pParse->nErr ) return 0;
   while( pSelect->pPrior ) pSelect = pSelect->pPrior;
   pTab = sqlite3DbMallocZero(db, sizeof(Table) );