From: drh <drh@noemail.net>
Date: Wed, 9 Aug 2000 17:17:25 +0000 (+0000)
Subject: bug fix (CVS 130)
X-Git-Tag: version-3.6.10~5965
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=30cab80923fc78a1bc916945c881b246f71f4029;p=thirdparty%2Fsqlite.git

bug fix (CVS 130)

FossilOrigin-Name: e8882dac2306afbc7bffdaa93c9a7fc45fdbd8e1
---

diff --git a/manifest b/manifest
index c77194501e..53f7b5d18c 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\spattern\smatching\sto\sthe\s.table\scommand\s(CVS\s129)
-D 2000-08-08T20:19:09
+C bug\sfix\s(CVS\s130)
+D 2000-08-09T17:17:25
 F COPYRIGHT 74a8a6531a42e124df07ab5599aad63870fa0bd4
 F Makefile.in 670aa9413cb2cdcded23b328a9e255c845c41a1e
 F README 51f6a4e7408b34afa5bc1c0485f61b6a4efb6958
@@ -20,7 +20,7 @@ F src/shell.tcl 27ecbd63dd88396ad16d81ab44f73e6c0ea9d20e
 F src/sqlite.h 82ae53028e27919250f886ff9d7c4927de81978a
 F src/sqliteInt.h f6d1e139b3bfa4ceff2136684e19d76b53178ec0
 F src/tclsqlite.c b1ae6abd50d8b0e2470cc49b5e1d03329a68dd75
-F src/tokenize.c 77ff8164a8751994bc9926ce282847f653ac0c16
+F src/tokenize.c 097bec5843d4a0fb4509e036fee93bac080c5e73
 F src/update.c 51b9ef7434b15e31096155da920302e9db0d27fc
 F src/util.c b75b33e6bd5d47898bb7ed9fdd0dea4fe7c19b00
 F src/vdbe.c bdedf21230581f0cf73a2dcd8fe23f30cf30ebe6
@@ -60,7 +60,7 @@ F www/arch.fig 4e26e9dca3c49724fc8f554c695ddea9f2413156
 F www/arch.png c4d908b79065a72e7dcf19317f36d1324c550e87
 F www/arch.tcl 4f6a9afecc099a27bba17b4f8cc9561abc15dc40
 F www/c_interface.tcl 29593cf77025bab137b7ba64b9459eb5eb6b4873
-F www/changes.tcl 0dc473e0b4240c5711653dbe589fac77508a5c3f
+F www/changes.tcl 93793b1f28248282fcd3c953f46c78ee7c5819f0
 F www/crosscompile.tcl 19734ce7f18b16ff2ed8479412abf8aca56e1dcc
 F www/fileformat.tcl cfb7fba80b7275555281ba2f256c00734bcdd1c9
 F www/index.tcl 421bcabc6839eb00698b75b169caa8a559454515
@@ -69,7 +69,7 @@ F www/mingw.tcl fc5f4ba9d336b6e8c97347cc6496d6162461ef60
 F www/opcode.tcl cb3a1abf8b7b9be9f3a228d097d6bf8b742c2b6f
 F www/sqlite.tcl cb0d23d8f061a80543928755ec7775da6e4f362f
 F www/vdbe.tcl bcbfc33bcdd0ebad95eab31286adb9e1bc289520
-P d53cccda4fa5d2f8287421e71488817eb4ca13eb
-R c2912166785333a778527e99f3e6b1d7
+P 2b3511eca7e562ef2428cec2f7eeca1d26b6c1c8
+R feae1ba062714e41beac70a905f9d7a4
 U drh
-Z 6e010a7ae0b6272f5ce57bde940ce4a2
+Z 9ca7c4666791da386e3fb1b846e0d62e
diff --git a/manifest.uuid b/manifest.uuid
index 0728dee17d..1554b72d37 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-2b3511eca7e562ef2428cec2f7eeca1d26b6c1c8
\ No newline at end of file
+e8882dac2306afbc7bffdaa93c9a7fc45fdbd8e1
\ No newline at end of file
diff --git a/src/tokenize.c b/src/tokenize.c
index c4d29f5857..a374ec3852 100644
--- 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.12 2000/06/16 20:51:26 drh Exp $
+** $Id: tokenize.c,v 1.13 2000/08/09 17:17:25 drh Exp $
 */
 #include "sqliteInt.h"
 #include <ctype.h>
@@ -144,7 +144,7 @@ static int sqliteKeywordCode(const char *z, int n){
 int sqliteGetToken(const char *z, int *tokenType){
   int i;
   switch( *z ){
-    case ' ': case '\t': case '\n': case '\f': {
+    case ' ': case '\t': case '\n': case '\f': case '\r': {
       for(i=1; z[i] && isspace(z[i]); i++){}
       *tokenType = TK_SPACE;
       return i;
@@ -350,7 +350,7 @@ int sqliteRunParser(Parse *pParse, char *zSql, char **pzErrMsg){
         }else if( sqliteStrNICmp(z,"--vdbe-trace-off--", 18)==0 ){
           pParse->db->flags &= ~SQLITE_VdbeTrace;
 #ifdef MEMORY_DEBUG
-        }else if( sqliteStrNICmp(z,"--malloc-file=",14)==0 ){
+        }else if( sqliteStrNICmp(z,"--malloc-fail=",14)==0 ){
           sqlite_iMallocFail = atoi(&z[14]);
         }else if( sqliteStrNICmp(z,"--malloc-stats--", 16)==0 ){
           if( pParse->xCallback ){
diff --git a/www/changes.tcl b/www/changes.tcl
index 6fdbf29f59..0ca4c7293b 100644
--- a/www/changes.tcl
+++ b/www/changes.tcl
@@ -17,6 +17,10 @@ proc chng {date desc} {
   puts "<DD><P><UL>$desc</UL></P></DD>"
 }
 
+chng {2000 Aug 9} {
+<li>Treat carriage returns as white space.</li>
+}
+
 chng {2000 Aug 8} {
 <li>Added pattern matching to the ".table" command in the "sqlite"
 command shell.</li>