Index: src/shell.c
==================================================================
--- src/shell.c
+++ src/shell.c
@@ -1215,11 +1215,11 @@
      "UNIQUE INDEX",
      "VIEW",
      "TRIGGER",
      "VIRTUAL TABLE"
   };
-  int i = 0, n;
+  int i = 0;
   const char *zIn = (const char*)sqlite3_value_text(apVal[0]);
   const char *zSchema = (const char*)sqlite3_value_text(apVal[1]);
   assert( nVal==2 );
   if( zIn!=0 && strncmp(zIn, "CREATE ", 7)==0 ){
     for(i=0; i<sizeof(aPrefix)/sizeof(aPrefix[0]); i++){
@@ -5816,17 +5816,17 @@
         sqlite3_snprintf(sizeof(zScNum), zScNum, "%d", ++iSchema);
         appendText(&sSelect, zDiv, 0);
         zDiv = " UNION ALL ";
         if( strcmp(zDb, "main")!=0 ){
           appendText(&sSelect, "SELECT shell_add_schema(sql,", 0);
-          appendText(&sSelect, sqlite3_column_text(pStmt, 0), '"');
+          appendText(&sSelect, zDb, '"');
           appendText(&sSelect, ") AS sql, type, tbl_name, name, rowid,", 0);
           appendText(&sSelect, zScNum, 0);
           appendText(&sSelect, " AS snum, ", 0);
           appendText(&sSelect, zDb, '\'');
           appendText(&sSelect, " AS sname FROM ", 0);
-          appendText(&sSelect, sqlite3_column_text(pStmt, 0), '"');
+          appendText(&sSelect, zDb, '"');
           appendText(&sSelect, ".sqlite_master", 0);
         }else{
           appendText(&sSelect, "SELECT sql, type, tbl_name, name, rowid, ", 0);
           appendText(&sSelect, zScNum, 0);
           appendText(&sSelect, " AS snum, 'main' AS sname FROM sqlite_master",0);