Fix a bug in the -separator command-line option. (CVS 351)

FossilOrigin-Name: 593c986f694b14839b2a2ed1da4da468c53fefa5

diff --git a/manifest b/manifest
index c3da224cff160579fd7a4a7940ae5976d1fc20fa..e423c06782055495d9e238c9b31e3332a0651e0e 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C The\sright-hand\sside\sof\san\sAS\sin\sa\sSELECT\scan\sbe\sused\swithin\sexpressions\sof\nthe\sWHERE,\sORDER\sBY,\sGROUP\sBY,\sand/or\sHAVING\sclauses.\s(CVS\s350)
-D 2002-01-22T03:13:42
+C Fix\sa\sbug\sin\sthe\s-separator\scommand-line\soption.\s(CVS\s351)
+D 2002-01-22T12:39:24
 F Makefile.in 9fa4277413bf1d9cf91365f07d4108d7d87ed2af
 F Makefile.template 3e26a3b9e7aee1b811deaf673e8d8973bdb3f22d
 F README a4c0ba11354ef6ba0776b400d057c59da47a4cc0
@@ -37,7 +37,7 @@ F src/parse.y f3fc4fb5766393003577bd175eb611495f6efd9f
 F src/printf.c 300a90554345751f26e1fc0c0333b90a66110a1d
 F src/random.c f6b36bec5ebd3edb3440224bf5bf811fe4ac9a1b
 F src/select.c f944a94d5004a1b87a5c6b1e41c29ac94488b42a
-F src/shell.c 539a41d4121ed371d438d57d829e53056a54471c
+F src/shell.c a77f9f1fad44a6e109b0c1bf7a170896842564e1
 F src/shell.tcl 27ecbd63dd88396ad16d81ab44f73e6c0ea9d20e
 F src/sqlite.h.in f57074c84a2c112a5093ba7a9d9636aa9cacc87c
 F src/sqliteInt.h 576b7b8165b2d78204412227e242cded54188bd5
@@ -105,7 +105,7 @@ F www/arch.fig d5f9752a4dbf242e9cfffffd3f5762b6c63b3bcf
 F www/arch.png 82ef36db1143828a7abc88b1e308a5f55d4336f4
 F www/arch.tcl 72a0c80e9054cc7025a50928d28d9c75c02c2b8b
 F www/c_interface.tcl 82a026b1681757f13b3f62e035f3a31407c1d353
-F www/changes.tcl 0f1348ff7203706633953211c7b4bb73bd6a723f
+F www/changes.tcl 57cad633740a4b66cdd20d5eb1915295186c7d20
 F www/crosscompile.tcl 3622ebbe518927a3854a12de51344673eb2dd060
 F www/download.tcl 1ea61f9d89a2a5a9b2cee36b0d5cf97321bdefe0
 F www/dynload.tcl 02eb8273aa78cfa9070dd4501dca937fb22b466c
@@ -119,7 +119,7 @@ F www/speed.tcl 83457b2bf6bb430900bd48ca3dd98264d9a916a5
 F www/sqlite.tcl 8b5884354cb615049aed83039f8dfe1552a44279
 F www/tclsqlite.tcl 829b393d1ab187fd7a5e978631b3429318885c49
 F www/vdbe.tcl 2013852c27a02a091d39a766bc87cff329f21218
-P a4fe893ce7cdec0d8a4f8cdc640b8967dce7763e
-R 42174a8584ff6b02199355782a39f765
+P 3684beab0f8a71ebdf453871bbde7a9ab1f65385
+R 6d4c394d2d59431cbf3d37aead44f9b9
 U drh
-Z 43f0669b77399b52f2f84c6f1b77e1c1
+Z d7239dce89c2468939138d009d7b5be4

diff --git a/manifest.uuid b/manifest.uuid
index 6ed609124d73ff571fcc5a5dcbad470b076be46d..611b7640dde3b7c7a4ff05d8aff73e37412eb78a 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-3684beab0f8a71ebdf453871bbde7a9ab1f65385
\ No newline at end of file
+593c986f694b14839b2a2ed1da4da468c53fefa5
\ No newline at end of file

diff --git a/src/shell.c b/src/shell.c
index 660dce6e6dc05a1f42a9ee31cce69a13fe742e02..0b9c18f4322f38ec5369031099cc26d5a71c073b 100644 (file)
--- a/src/shell.c
+++ b/src/shell.c
@@ -12,7 +12,7 @@
 ** This file contains code to implement the "sqlite" command line
 ** utility for accessing SQLite databases.
 **
-** $Id: shell.c,v 1.42 2002/01/15 18:39:45 drh Exp $
+** $Id: shell.c,v 1.43 2002/01/22 12:39:24 drh Exp $
 */
 #include <stdlib.h>
 #include <string.h>
@@ -866,7 +866,7 @@ int main(int argc, char **argv){
       data.mode = MODE_Line;
       argc--;
       argv++;
-    }else if( argc>=3 && strcmp(argv[0],"-separator")==0 ){
+    }else if( argc>=3 && strcmp(argv[1],"-separator")==0 ){
       sprintf(data.separator,"%.*s",(int)sizeof(data.separator)-1,argv[2]);
       argc -= 2;
       argv += 2;

diff --git a/www/changes.tcl b/www/changes.tcl
index 9e231ba360b6e8609f2eafa6c9980ec95b7aa0cf..62b00275a52c119341511f47dd0079f77ee2b726 100644 (file)
--- a/www/changes.tcl
+++ b/www/changes.tcl
@@ -21,6 +21,8 @@ chng {2002 Jan ?? (2.2.4)} {
 <li>The label to the right of an AS in the column list of a SELECT can now
     be used as part of an expression in the WHERE, ORDER BY, GROUP BY, and/or
     HAVING clauses.</li>
+<li>Fix a bug in the <b>-separator</b> command-line option to the <b>sqlite</b>
+    command.</li>
 }
 
 chng {2002 Jan 16 (2.2.3)} {