From: mistachkin Date: Mon, 1 Sep 2014 01:15:22 +0000 (+0000) Subject: Merge updates from trunk. X-Git-Tag: version-3.8.8~17^2~8 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=18c8b58033c626f5f608c0050033fc7c2c5937c7;p=thirdparty%2Fsqlite.git Merge updates from trunk. FossilOrigin-Name: 51f33cf1290cf767c1c6ba0228f4f30e4059c994 --- 18c8b58033c626f5f608c0050033fc7c2c5937c7 diff --cc manifest index 3c60bf2ba4,b65dc64d8c..ca272bdab7 --- a/manifest +++ b/manifest @@@ -1,5 -1,5 +1,5 @@@ - C Correct\shelp\stext\sand\smake\sconsistent\suse\sof\ssnprintf. - D 2014-07-24T22:51:18.860 -C In\sthe\scommand-line\sshell,\sadded\soptions\s--lookaside,\s--pagecache,\sand\n--scratch\sused\sto\sconfigure\sauxiliary\smemories. -D 2014-08-30T15:49:25.923 ++C Merge\supdates\sfrom\strunk. ++D 2014-09-01T01:15:22.673 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f F Makefile.in 5eb79e334a5de69c87740edd56af6527dd219308 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23 @@@ -207,27 -208,27 +208,27 @@@ F src/os.c 1b147e4cf7cc39e618115c14a086 F src/os.h 60d419395e32a8029fa380a80a3da2e9030f635e F src/os_common.h 92815ed65f805560b66166e3583470ff94478f04 F src/os_setup.h c9d4553b5aaa6f73391448b265b89bed0b890faa - F src/os_unix.c a7baf1b30f3c58ba20b813e01aab23b18ae44f85 - F src/os_win.c 8dbf6c11780fe2eb96c1f289e664d0c7b2911d37 - F src/os_win.h 057344a6720b4c8405d9bd98f58cb37a6ee46c25 - F src/pager.c f6bb1fa6cdf2062f2d8aec3e64db302bca519ab8 + F src/os_unix.c bd7df3094a60915c148517504c76df4fca24e542 + F src/os_win.c d067fce558a5032e6e6afe62899e5397bf63cf3e + F src/os_win.h 09e751b20bbc107ffbd46e13555dc73576d88e21 + F src/pager.c 3e732d2bbdd8d8d95fed0c5ae7e718d73153c4c5 F src/pager.h ffd5607f7b3e4590b415b007a4382f693334d428 F src/parse.y 22d6a074e5f5a7258947a1dc55a9bf946b765dd0 - F src/pcache.c d8eafac28290d4bb80332005435db44991d07fc2 - F src/pcache.h a5e4f5d9f5d592051d91212c5949517971ae6222 - F src/pcache1.c 102e6f5a2fbc646154463eb856d1fd716867b64c - F src/pragma.c e17c5ea1cb9eb9d93c41bbb7c3a17e747d5e0335 - F src/prepare.c 677521ab7132615a8a26107a1d1c3132f44ae337 - F src/printf.c af06f66927919730f03479fed6ae9854f73419f4 + F src/pcache.c 3b3791297e8977002e56b4a9b8916f2039abad9b + F src/pcache.h 9b559127b83f84ff76d735c8262f04853be0c59a + F src/pcache1.c c5af6403a55178c9d1c09e4f77b0f9c88822762c + F src/pragma.c d10ef67c4de79f78188b965b4b7988aff1d66f2e + F src/prepare.c 3842c1dfc0b053458e3adcf9f6efc48e03e3fe3d + F src/printf.c 00986c86ddfffefc2fd3c73667ff51b3b9709c74 F src/random.c d10c1f85b6709ca97278428fd5db5bbb9c74eece - F src/resolve.c 5fc110baeacf120a73fe34e103f052632ff11a02 + F src/resolve.c 0ea356d32a5e884add23d1b9b4e8736681dd5697 F src/rowset.c a9c9aae3234b44a6d7c6f5a3cadf90dce1e627be - F src/select.c 6762c62e11b504aa014edceab8886495165e3a77 - F src/shell.c 5129214fbe720ce24802e750b1ac0a49f04034cd - F src/sqlite.h.in ac4451c9da2771d2f4d702ef89722407242906d9 - F src/sqlite3.rc 11094cc6a157a028b301a9f06b3d03089ea37c3e + F src/select.c 1c4667571f2c9e339b5a5c5b152a9ea7b0bc4163 -F src/shell.c 10b3bbf929aca5f33815444f03c9eac17e3c6daf ++F src/shell.c 31c5f73b524e86d675786e45c4bb2a2260ed65d8 + F src/sqlite.h.in ed9d35990c61f0388ca6405706455c4095310553 + F src/sqlite3.rc 992c9f5fb8285ae285d6be28240a7e8d3a7f2bad F src/sqlite3ext.h 886f5a34de171002ad46fae8c36a7d8051c190fc - F src/sqliteInt.h 152134c6223369e2e1acb7b9cc2c0db052dae28a + F src/sqliteInt.h d8a9be2aa123a78c90ad4aba09b23e7dd3f8cc9f F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d F src/status.c 7ac05a5c7017d0b9f0b4bcd701228b784f987158 F src/table.c 2cd62736f845d82200acfa1287e33feb3c15d62e @@@ -1184,7 -1188,7 +1188,7 @@@ F tool/vdbe_profile.tcl 67746953071a9f8 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4 F tool/warnings.sh 0abfd78ceb09b7f7c27c688c8e3fe93268a13b32 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f - P b84008cb964f234b6a6b441f738e344158c4c92a - R 0b04208537b14ee3bcc223e1a9755bab -P 2a74129a21f9745f1363f844807e2d10201a3f40 -R 3444e463c529c6a0145dadfcb31aa003 -U drh -Z 5a770ceaa0af97ce932adfe78ff7c68a ++P 9c424a5c50e4a2ed36556e99fba0e7072a2d3468 f61db04be4d7fb21b7f721647c37c45e283ffbea ++R 61b36872188d211211b1fdf63b047fab +U mistachkin - Z 0945ca559f52609ad97025a5011e881c ++Z fd2f22c6bf37426e61dcc4cb1f623893 diff --cc manifest.uuid index 6c6478f98e,ae67577cfc..7b6f164ccd --- a/manifest.uuid +++ b/manifest.uuid @@@ -1,1 -1,1 +1,1 @@@ - 9c424a5c50e4a2ed36556e99fba0e7072a2d3468 -f61db04be4d7fb21b7f721647c37c45e283ffbea ++51f33cf1290cf767c1c6ba0228f4f30e4059c994 diff --cc src/shell.c index 3f67986967,994675ba11..25d2f673e5 --- a/src/shell.c +++ b/src/shell.c @@@ -457,9 -462,9 +462,10 @@@ struct ShellState int mode; /* An output mode setting */ int writableSchema; /* True if PRAGMA writable_schema=ON */ int showHeader; /* True to show column names in List or Column mode */ + unsigned shellFlgs; /* Various flags */ char *zDestTable; /* Name of destination table when MODE_Insert */ - char separator[20]; /* Separator character for MODE_List */ + char colSeparator[20]; /* Column separator character for several modes */ + char rowSeparator[20]; /* Row separator character for MODE_Ascii */ char newline[20]; /* Record separator in MODE_Csv */ int colWidth[100]; /* Requested width of each column when in column mode*/ int actualWidth[100]; /* Actual width of each column */ @@@ -3283,27 -3161,23 +3296,27 @@@ static int do_meta_command(char *zLine rc = 1; goto meta_command_exit; } - fprintf(p->out,"%9.9s: %s\n","echo", p->echoOn ? "on" : "off"); - fprintf(p->out,"%9.9s: %s\n","eqp", p->autoEQP ? "on" : "off"); + fprintf(p->out,"%12.12s: %s\n","echo", p->echoOn ? "on" : "off"); + fprintf(p->out,"%12.12s: %s\n","eqp", p->autoEQP ? "on" : "off"); - fprintf(p->out,"%12.12s: %s\n","explain", p->explainPrev.valid ? "on" :"off"); + fprintf(p->out,"%9.9s: %s\n","explain", p->normalMode.valid ? "on" :"off"); - fprintf(p->out,"%9.9s: %s\n","headers", p->showHeader ? "on" : "off"); - fprintf(p->out,"%9.9s: %s\n","mode", modeDescr[p->mode]); - fprintf(p->out,"%9.9s: ", "nullvalue"); + fprintf(p->out,"%12.12s: %s\n","headers", p->showHeader ? "on" : "off"); + fprintf(p->out,"%12.12s: %s\n","mode", modeDescr[p->mode]); + fprintf(p->out,"%12.12s: ", "nullvalue"); output_c_string(p->out, p->nullvalue); fprintf(p->out, "\n"); - fprintf(p->out,"%9.9s: %s\n","output", + fprintf(p->out,"%12.12s: %s\n","output", strlen30(p->outfile) ? p->outfile : "stdout"); - fprintf(p->out,"%9.9s: ", "separator"); - output_c_string(p->out, p->separator); - fprintf(p->out," "); + fprintf(p->out,"%12.12s: ", "colseparator"); + output_c_string(p->out, p->colSeparator); + fprintf(p->out, "\n"); + fprintf(p->out,"%12.12s: ", "rowseparator"); + output_c_string(p->out, p->rowSeparator); + fprintf(p->out, "\n"); + fprintf(p->out,"%12.12s: ", "newline"); output_c_string(p->out, p->newline); fprintf(p->out, "\n"); - fprintf(p->out,"%9.9s: %s\n","stats", p->statsOn ? "on" : "off"); - fprintf(p->out,"%9.9s: ","width"); + fprintf(p->out,"%12.12s: %s\n","stats", p->statsOn ? "on" : "off"); + fprintf(p->out,"%12.12s: ","width"); for (i=0;i<(int)ArraySize(p->colWidth) && p->colWidth[i] != 0;i++) { fprintf(p->out,"%d ",p->colWidth[i]); } @@@ -3921,7 -3794,8 +3935,9 @@@ static const char zOptions[] #endif " -newline SEP set newline character(s) for CSV\n" " -nullvalue TEXT set text string for NULL values. Default ''\n" + " -pagecache SIZE N use N slots of SZ bytes each for page cache memory\n" + " -rowseparator SEP set output line separator. Default: '\\n'\n" + " -scratch SIZE N use N slots of SZ bytes each for scratch memory\n" " -separator SEP set output field separator. Default: '|'\n" " -stats print memory stats before each finalize\n" " -version show SQLite version\n" @@@ -3946,18 -3820,18 +3962,19 @@@ static void usage(int showDetail) /* ** Initialize the state information in data */ - static void main_init(struct callback_data *data) { + static void main_init(ShellState *data) { memset(data, 0, sizeof(*data)); data->mode = MODE_List; - memcpy(data->separator,"|", 2); - memcpy(data->newline,"\r\n", 3); + memcpy(data->colSeparator,SEP_Column, 2); + memcpy(data->rowSeparator,SEP_Row, 2); + memcpy(data->newline,SEP_CrLf, 3); data->showHeader = 0; + data->shellFlgs = SHFLG_Lookaside; sqlite3_config(SQLITE_CONFIG_URI, 1); sqlite3_config(SQLITE_CONFIG_LOG, shellLog, data); + sqlite3_config(SQLITE_CONFIG_MULTITHREAD); sqlite3_snprintf(sizeof(mainPrompt), mainPrompt,"sqlite> "); sqlite3_snprintf(sizeof(continuePrompt), continuePrompt," ...> "); - sqlite3_config(SQLITE_CONFIG_SINGLETHREAD); } /*