:-) (CVS 68)

FossilOrigin-Name: fc8d25ea1fffa115fad15b9eb8bb0b0aaaff0431

diff --git a/manifest b/manifest
index c17a49ba94931ceb5c2a984429a2524db3f81f36..3d721383629e0e86781de05802e23c1fbece2f6d 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C :-)\s(CVS\s67)
-D 2000-06-07T01:33:42
+C :-)\s(CVS\s68)
+D 2000-06-07T02:04:23
 F COPYRIGHT 74a8a6531a42e124df07ab5599aad63870fa0bd4
 F Makefile.in 17ba1ccf8d2d40c627796bba8f72952365d6d644
 F README 51f6a4e7408b34afa5bc1c0485f61b6a4efb6958
@@ -15,11 +15,11 @@ F src/insert.c 5e69dd70c3f91cf5ec5090f39fd6cd8e135af9bf
 F src/main.c 93a7ad14bb5a82ad13ad59da23ef674a94b0c3d6
 F src/parse.y 8b632f4c4ff2f4400f15592ca9d8fda27d97d0c4
 F src/select.c 74fa3af62bfa2e6e29f43153f883fd28c295b853
-F src/shell.c 9c9813926fa125c226d4bec464c9b9fdd6bf78f7
+F src/shell.c 3f4afc39a36e4824e8aa262623fd03568874799e
 F src/sqlite.h 58da0a8590133777b741f9836beaef3d58f40268
 F src/sqliteInt.h 3cca846df0a8b5f811cf4f8021303547cd8f21fd
 F src/tclsqlite.c 9f358618ae803bedf4fb96da5154fd45023bc1f7
-F src/tokenize.c 09373590cc3942aa4744eb431ac5b5ce31e7cfea
+F src/tokenize.c 900af9479d0feaa76b0225680196aa81afec930a
 F src/update.c 18746f920f989b3d19d96c08263c92584823cd35
 F src/util.c 33f9baa01e45394ef0cf85361a0e872987884315
 F src/vdbe.c d2ac31f6c0bb967b47409e715872992dd2fa62d3
@@ -51,7 +51,7 @@ F www/c_interface.tcl 9ac800854272db5fe439e07b7435b243a5422293
 F www/changes.tcl 04e66b4257589ff78a7e1de93e9dda4725fb03d6
 F www/index.tcl 52e29a4eeda8d59e91af43c61fef177c5f2ffd53
 F www/sqlite.tcl 2f933ce18cffd34a0a020a82435ab937137970fd
-P 5d2e72e4bd5e218133190b8b1ebe52f48e2d7140
-R 1384c304cdabddd80130851d4edee697
+P 8bff1bee63b77353b4cfe5aa0c662187a7bf93da
+R 66723773907deae85c622c6e494a06db
 U drh
-Z 007e2024f795b53d937e0ac66c9776f0
+Z 03e9a47b962f6283d6dab7f071f9c9ae

diff --git a/manifest.uuid b/manifest.uuid
index 7f56c3d1840722a923e0ce5bc6e83449bba7f7f4..87b75f85141040a54f3b9833d09321962836fd55 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-8bff1bee63b77353b4cfe5aa0c662187a7bf93da
\ No newline at end of file
+fc8d25ea1fffa115fad15b9eb8bb0b0aaaff0431
\ No newline at end of file

diff --git a/src/shell.c b/src/shell.c
index 0a0a975ca8cc94f3feb4f3f5085270b45c177729..da0f1e69bfb18a12dbc9a657b31450154b6c7a53 100644 (file)
--- a/src/shell.c
+++ b/src/shell.c
@@ -24,7 +24,7 @@
 ** This file contains code to implement the "sqlite" command line
 ** utility for accessing SQLite databases.
 **
-** $Id: shell.c,v 1.11 2000/06/07 01:33:42 drh Exp $
+** $Id: shell.c,v 1.12 2000/06/07 02:04:23 drh Exp $
 */
 #include <stdlib.h>
 #include <string.h>
@@ -212,7 +212,7 @@ static int callback(void *pArg, int nArg, char **azArg, char **azCol){
           }
           if( z[j] ){
             fprintf(p->out, "\\%c", z[j]);
-            z = &z[j+1];
+            z++;
           }
           z += j;
         }
@@ -256,6 +256,7 @@ static int dump_callback(void *pArg, int nArg, char **azArg, char **azCol){
     char zSql[1000];
     d2 = *pData;
     d2.mode = MODE_List;
+    d2.escape = '\t';
     strcpy(d2.separator,"\t");
     fprintf(pData->out, "COPY '%s' FROM STDIN;\n", azArg[0]);
     sprintf(zSql, "SELECT * FROM '%s'", azArg[0]);

diff --git a/src/tokenize.c b/src/tokenize.c
index f750debe13cd65b5d87b1179638b9a84b96026df..ef2726a4f5294d46811a1e1b10b45278c24f5e3d 100644 (file)
--- a/src/tokenize.c
+++ b/src/tokenize.c
@@ -27,7 +27,7 @@
 ** individual tokens and sends those tokens one-by-one over to the
 ** parser for analysis.
 **
-** $Id: tokenize.c,v 1.8 2000/06/06 21:56:08 drh Exp $
+** $Id: tokenize.c,v 1.9 2000/06/07 02:04:23 drh Exp $
 */
 #include "sqliteInt.h"
 #include <ctype.h>
@@ -337,7 +337,7 @@ int sqliteRunParser(Parse *pParse, char *zSql, char **pzErrMsg){
           sqliteParserTrace(trace, "parser: ");
         }else if( sqliteStrNICmp(z,"--vdbe-trace-on--",17)==0 ){
           pParse->db->flags |= SQLITE_VdbeTrace;
-        }else if( sqliteStrNICmp(z,"--vdbe-trace-off--", 19)==0 ){
+        }else if( sqliteStrNICmp(z,"--vdbe-trace-off--", 18)==0 ){
           pParse->db->flags &= ~SQLITE_VdbeTrace;
         }
         break;