diff options
| author | drh <drh@noemail.net> | 2014-08-21 16:09:36 +0000 |
|---|---|---|
| committer | drh <drh@noemail.net> | 2014-08-21 16:09:36 +0000 |
| commit | 2571e4eddd05dceb9c707e8356153d0836d84228 (patch) | |
| tree | 323ddb8b65cd40629b860f2b64cd1fb71efd023a /src/shell.c | |
| parent | 3a432b0b475fa5ae550a1ab35279c2647344138c (diff) | |
| parent | b6b4b79f344096791542265763467fc90f139c2e (diff) | |
| download | sqlite-2571e4eddd05dceb9c707e8356153d0836d84228.tar.gz sqlite-2571e4eddd05dceb9c707e8356153d0836d84228.zip | |
Merge all recent trunk changes, especially the fix for
ticket [369d57fb8e5ccdff06f1], but also the skip-scan improvement and
performance improvements in the b-tree code.
FossilOrigin-Name: 0b9e2c3269695713b538561d999c68097db70f0c
Diffstat (limited to 'src/shell.c')
| -rw-r--r-- | src/shell.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/shell.c b/src/shell.c index ac4290958..932f561bd 100644 --- a/src/shell.c +++ b/src/shell.c @@ -1988,7 +1988,11 @@ static FILE *output_file_open(const char *zFile){ */ static void sql_trace_callback(void *pArg, const char *z){ FILE *f = (FILE*)pArg; - if( f ) fprintf(f, "%s\n", z); + if( f ){ + int i = (int)strlen(z); + while( i>0 && z[i-1]==';' ){ i--; } + fprintf(f, "%.*s;\n", i, z); + } } /* @@ -2600,7 +2604,7 @@ static int do_meta_command(char *zLine, ShellState *p){ " (SELECT sql sql, type type, tbl_name tbl_name, name name, rowid x" " FROM sqlite_master UNION ALL" " SELECT sql, type, tbl_name, name, rowid FROM sqlite_temp_master) " - "WHERE type!='meta' AND sql NOTNULL AND name NOT LIKE 'sqlite_%'" + "WHERE type!='meta' AND sql NOTNULL AND name NOT LIKE 'sqlite_%' " "ORDER BY rowid", callback, &data, &zErrMsg ); @@ -3155,7 +3159,7 @@ static int do_meta_command(char *zLine, ShellState *p){ " (SELECT sql sql, type type, tbl_name tbl_name, name name, rowid x" " FROM sqlite_master UNION ALL" " SELECT sql, type, tbl_name, name, rowid FROM sqlite_temp_master) " - "WHERE type!='meta' AND sql NOTNULL AND name NOT LIKE 'sqlite_%'" + "WHERE type!='meta' AND sql NOTNULL AND name NOT LIKE 'sqlite_%' " "ORDER BY rowid", callback, &data, &zErrMsg ); |