diff options
| author | Alex Naidis <alex.naidis@linux.com> | 2017-02-13 18:23:48 +0100 |
|---|---|---|
| committer | Alex Naidis <alex.naidis@linux.com> | 2017-02-13 18:25:09 +0100 |
| commit | 4b7ed9600a8a9a52e622980c609aab9038bdf6b4 (patch) | |
| tree | a00d82d99d84bd94144d60c4fa10243a11c88cc5 /dist/orig/shell.c | |
| parent | 1a7b17477809c6d786c2e1a4a9fa9ceff7dc5384 (diff) | |
sqlite: Upgrade to SQLite 3.17.0
Downloaded from https://sqlite.org/2017/sqlite-amalgamation-3170000.zip
$ sha256sum sqlite-amalgamation-3170000.zip
ad3d5152f7dd09117654736b416e656c46de83b251e71a14b9a2de3aab29cfb2 sqlite-amalgamation-3170000.zip
dist/orig contains the stock sqlite3 code, as packaged in the ZIP file above.
dist contains a copy of dist/orig, but with the Android.patch file applied.
Please see Android.patch for a list of differences between stock and
Android.
The Android specific patch applied cleanly and was regenerated.
This major release contains many performance improvements,
some of which will increase the memory consumption.
It also uses about 6.5% fewer CPU cycles.
More details about the release are available here: https://sqlite.org/releaselog/3_17_0.html
Change-Id: I236e27a22880f783358941e00059a1ee50a06e75
Signed-off-by: Alex Naidis <alex.naidis@linux.com>
Diffstat (limited to 'dist/orig/shell.c')
| -rw-r--r-- | dist/orig/shell.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/dist/orig/shell.c b/dist/orig/shell.c index b0928ce..0e553d9 100644 --- a/dist/orig/shell.c +++ b/dist/orig/shell.c @@ -4288,15 +4288,20 @@ static int do_meta_command(char *zLine, ShellState *p){ int c2 = zMode[0]; if( c2=='l' && n2>2 && strncmp(azArg[1],"lines",n2)==0 ){ p->mode = MODE_Line; + sqlite3_snprintf(sizeof(p->rowSeparator), p->rowSeparator, SEP_Row); }else if( c2=='c' && strncmp(azArg[1],"columns",n2)==0 ){ p->mode = MODE_Column; + sqlite3_snprintf(sizeof(p->rowSeparator), p->rowSeparator, SEP_Row); }else if( c2=='l' && n2>2 && strncmp(azArg[1],"list",n2)==0 ){ p->mode = MODE_List; + sqlite3_snprintf(sizeof(p->colSeparator), p->colSeparator, SEP_Column); + sqlite3_snprintf(sizeof(p->rowSeparator), p->rowSeparator, SEP_Row); }else if( c2=='h' && strncmp(azArg[1],"html",n2)==0 ){ p->mode = MODE_Html; }else if( c2=='t' && strncmp(azArg[1],"tcl",n2)==0 ){ p->mode = MODE_Tcl; sqlite3_snprintf(sizeof(p->colSeparator), p->colSeparator, SEP_Space); + sqlite3_snprintf(sizeof(p->rowSeparator), p->rowSeparator, SEP_Row); }else if( c2=='c' && strncmp(azArg[1],"csv",n2)==0 ){ p->mode = MODE_Csv; sqlite3_snprintf(sizeof(p->colSeparator), p->colSeparator, SEP_Comma); @@ -5297,7 +5302,7 @@ static int do_meta_command(char *zLine, ShellState *p){ if( c=='v' && strncmp(azArg[0], "vfsinfo", n)==0 ){ const char *zDbName = nArg==2 ? azArg[1] : "main"; - sqlite3_vfs *pVfs; + sqlite3_vfs *pVfs = 0; if( p->db ){ sqlite3_file_control(p->db, zDbName, SQLITE_FCNTL_VFS_POINTER, &pVfs); if( pVfs ){ |