bug fix (CVS 123)

FossilOrigin-Name: 4dabf5e4e647f6dcdcfd45d1e885e379357a2d57

diff --git a/manifest b/manifest
index 810127194db51e41c2996c18991c7b550ef07358..74f20d8113c5acc42031158693d87693dd6a3489 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,12 +1,12 @@
-C file\sformat\schange\s(CVS\s122)
-D 2000-08-02T13:47:42
+C bug\sfix\s(CVS\s123)
+D 2000-08-03T15:09:20
 F COPYRIGHT 74a8a6531a42e124df07ab5599aad63870fa0bd4
 F Makefile.in 670aa9413cb2cdcded23b328a9e255c845c41a1e
 F README 51f6a4e7408b34afa5bc1c0485f61b6a4efb6958
 F configure 51063d594190fa085f909cefc9427241088bec4f x
 F configure.in a04f02ba61ed09a00e862b4f78b91b06a559e0b5
 F doc/lemon.html e233a3e97a779c7a87e1bc4528c664a58e49dd47
-F src/build.c afdbf21315526902577ebeb690737a27ab73c2a1
+F src/build.c 4d90e9e94750ca80249fc7958c617021d8bb7a50
 F src/dbbe.c 5c69d68fe8d9461e56d066f9a7f693636c02d0c7
 F src/dbbe.h 8718b718b36d37584e9bbdfccec10588fa91271f
 F src/delete.c 4d491eaf61b515516749c7ed68fa3b2ee8a09065
@@ -59,7 +59,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 0fe8d43635dd08a01479774520f54149550cdb74
+F www/changes.tcl 4a1aaaaad9a9b4cf3259264955c225b98a9d025d
 F www/crosscompile.tcl 19734ce7f18b16ff2ed8479412abf8aca56e1dcc
 F www/fileformat.tcl 1c353d202cc75de55a916a1bab80e7b3cc5660ee
 F www/index.tcl 7982d6044d70c51d76e66fab0ce34091fa0fed66
@@ -68,7 +68,7 @@ F www/mingw.tcl fc5f4ba9d336b6e8c97347cc6496d6162461ef60
 F www/opcode.tcl cb3a1abf8b7b9be9f3a228d097d6bf8b742c2b6f
 F www/sqlite.tcl 69781eaffb02e17aa4af28b76a2bedb19baa8e9f
 F www/vdbe.tcl bcbfc33bcdd0ebad95eab31286adb9e1bc289520
-P 4110936f112092b3bbc134f0717b899aad6502ad
-R 27068e8e66b0ad6baca5a9255d7bc1a0
+P b7b90237945d3577caba3a2f5595e52b25027297
+R 45dde58542913e61e7cab05cfd34ec48
 U drh
-Z b61a3a088aa89de6d6b88a94a54cc74a
+Z bea34de057ed43e5dbbd37b540669064

diff --git a/manifest.uuid b/manifest.uuid
index 9c0270196146721eef8e0bffb36a619b04b1ac29..b24a4ebb97a7c7a8a9d46396da7cb38044d58ebb 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-b7b90237945d3577caba3a2f5595e52b25027297
\ No newline at end of file
+4dabf5e4e647f6dcdcfd45d1e885e379357a2d57
\ No newline at end of file

diff --git a/src/build.c b/src/build.c
index c2931bf0fb197987473af78c52b92e2bf096f6bc..180141a5bd5cb7e63b71ccc5bc0496f3d85d4d33 100644 (file)
--- a/src/build.c
+++ b/src/build.c
@@ -33,7 +33,7 @@
 **     COPY
 **     VACUUM
 **
-** $Id: build.c,v 1.22 2000/08/02 13:47:42 drh Exp $
+** $Id: build.c,v 1.23 2000/08/03 15:09:20 drh Exp $
 */
 #include "sqliteInt.h"
 
@@ -319,11 +319,11 @@ void sqliteAddDefaultValue(Parse *pParse, Token *pVal, int minusFlag){
 void sqliteEndTable(Parse *pParse, Token *pEnd){
   Table *p;
   int h;
-  int addVersion;      /* True to insert a "file format" meta record */
+  int addMeta;       /* True to insert a meta records into the file */
 
   if( pParse->nErr ) return;
   p = pParse->pNewTable;
-  addVersion =  p!=0 && pParse->db->nTable==1;
+  addMeta =  p!=0 && pParse->db->nTable==1;
 
   /* Add the table to the in-memory representation of the database
   */
@@ -367,7 +367,7 @@ void sqliteEndTable(Parse *pParse, Token *pEnd){
     sqliteVdbeChangeP3(v, base+3, p->zName, 0);
     sqliteVdbeChangeP3(v, base+4, p->zName, 0);
     sqliteVdbeChangeP3(v, base+5, pParse->sFirstToken.z, n);
-    if( addVersion ){
+    if( addMeta ){
       sqliteVdbeAddOpList(v, ArraySize(addVersion), addVersion);
     }
     sqliteVdbeAddOp(v, OP_Close, 0, 0, 0, 0);

diff --git a/www/changes.tcl b/www/changes.tcl
index c16b46cdf22b0d46f614f81dc908ec5eef45f2b1..d83039ff4becb1e31dc9d69e773ed4f8729831f6 100644 (file)
--- a/www/changes.tcl
+++ b/www/changes.tcl
@@ -17,6 +17,11 @@ proc chng {date desc} {
   puts "<DD><P><UL>$desc</UL></P></DD>"
 }
 
+chng {2000 Aug 3} {
+<li>File format version number was being stored in sqlite_master.tcl
+    multiple times. This was harmless, but unnecessary. It is now fixed.</li>
+}
+
 chng {2000 Aug 2} {
 <li>The file format for indices was changed slightly in order to work
     around an inefficiency that can sometimes come up with GDBM when