1 files changed, 3 insertions, 3 deletions
diff --git a/src/select.c b/src/select.c
index 7b9c47942..ab1cc5a27 100644
--- a/src/select.c
+++ b/src/select.c
@@ -12,7 +12,7 @@
 ** This file contains C code routines that are called by the parser
 ** to handle SELECT statements in SQLite.
 **
-** $Id: select.c,v 1.37 2001/09/16 00:13:27 drh Exp $
+** $Id: select.c,v 1.38 2001/10/06 16:33:03 drh Exp $
 */
 #include "sqliteInt.h"
 
@@ -250,7 +250,7 @@ void generateColumnNames(Parse *pParse, IdList *pTabList, ExprList *pEList){
       sprintf(zName, "column%d", i+1);
       sqliteVdbeAddOp(v, OP_ColumnName, i, 0, zName, 0);
     }else{
-      if( pTabList->nId>1 ){
+      if( pTabList->nId>1 || (pParse->db->flags & SQLITE_FullColNames)!=0 ){
         char *zName = 0;
         Table *pTab = pTabList->a[p->iTable].pTab;
         char *zTab;
@@ -861,7 +861,7 @@ int sqliteSelect(
   /* Initialize the memory cell to NULL
   */
   if( eDest==SRT_Mem ){
-    sqliteVdbeAddOp(v, OP_Null, 0, 0, 0, 0);
+    sqliteVdbeAddOp(v, OP_String, 0, 0, 0, 0);
     sqliteVdbeAddOp(v, OP_MemStore, iParm, 0, 0, 0);
   }