Merge all recent trunk changes into the sessions branch.

FossilOrigin-Name: f36bb5fa5c5e3430808fe35d58f45559a216d341

src/shell.c

@@ -3110,7 +3110,7 @@ static int do_meta_command(char *zLine, ShellState *p){
           fprintf(stderr, "%s:%d: expected %d columns but found %d - "
                           "filling the rest with NULL\n",
                           sCtx.zFile, startLine, nCol, i+1);
-          i++;
+          i += 2;
           while( i<=nCol ){ sqlite3_bind_null(pStmt, i); i++; }
         }
       }