Fix two bugs that were causing lots of tests to fail. (CVS 1386)

FossilOrigin-Name: 5cba8a510c0aeae740db695e960c60e5f6c303f5

diff --git a/manifest b/manifest
index 3b0084ec2fcc8d688301610b9fbbbfa1c81fd82a..ef7110089be1275d6219667546735dda3ebb3dc3 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C More\schanges\sto\ssupport\sthe\smanifest\stype\smodel.\sA\sfew\sthings\sare\scurrently\nbroken.\s(CVS\s1385)
-D 2004-05-16T11:15:36
+C Fix\stwo\sbugs\sthat\swere\scausing\slots\sof\stests\sto\sfail.\s(CVS\s1386)
+D 2004-05-16T11:57:28
 F Makefile.in ab7b0d5118e2da97bac66be8684a1034e3500f5a
 F Makefile.linux-gcc b86a99c493a5bfb402d1d9178dcdc4bd4b32f906
 F README f1de682fbbd94899d50aca13d387d1b3fd3be2dd
@@ -26,12 +26,12 @@ F src/auth.c 5c2f0bea4729c98c2be3b69d6b466fc51448fe79
 F src/btree.c 05aefd3eec56690d9731bf090203b57d8ae4bf19
 F src/btree.h 6f51ad0ffebfba71295fcacdbe86007512200050
 F src/btree_rb.c 9d7973e266ee6f9c61ce592f68742ce9cd5b10e5
-F src/build.c 6c0463907ba80e0269f0b7fdf4210a049275b48a
+F src/build.c fd37eda7100d2507c647df43f9f3ce56a2f59ab4
 F src/copy.c 4d2038602fd0549d80c59bda27d96f13ea9b5e29
 F src/date.c 0eb0a89960bb45c7f7e768748605a7a97b0c8064
 F src/delete.c ea8212a44b5c0dad8fb1794fe7297654f7ed05f9
 F src/encode.c a876af473d1d636faa3dca51c7571f2e007eea37
-F src/expr.c d2d1ddc0ee98f1d70c6caddc11b46a0121d9bddd
+F src/expr.c 28095b5617883e56dd21c9b4743e839070659a12
 F src/func.c cfbb7096efb58e2857e3b312a8958a12774b625a
 F src/hash.c 440c2f8cb373ee1b4e13a0988489c7cd95d55b6f
 F src/hash.h 762d95f1e567664d1eafc1687de755626be962fb
@@ -63,7 +63,7 @@ F src/update.c 04492438aee57a6be5a8a8e54e3add12c1d598ca
 F src/utf.c fc799748d43fe1982d157b871e3e420a19c85d4f
 F src/util.c f9511ffba78e6cf71a28774c2820d7750b5bacdf
 F src/vacuum.c c134702e023db8778e6be59ac0ea7b02315b5476
-F src/vdbe.c 38a477ae68e78936adb62ef9c6cffebdebbb5be5
+F src/vdbe.c c2feeaaf0c3c49326c5c702ad34bcc71f6c728c0
 F src/vdbe.h 94457ca73bae972dc61bca33a4dccc2e6e14e2f8
 F src/vdbeInt.h 311c2a046ea419781d0ef331198b7b0a65eebc92
 F src/vdbeaux.c bd259da3ae52cd4f6febb0c83f60c0b9170f3ebb
@@ -192,7 +192,7 @@ F www/sqlite.tcl 3c83b08cf9f18aa2d69453ff441a36c40e431604
 F www/tclsqlite.tcl b9271d44dcf147a93c98f8ecf28c927307abd6da
 F www/vdbe.tcl 9b9095d4495f37697fd1935d10e14c6015e80aa1
 F www/whentouse.tcl a8335bce47cc2fddb07f19052cb0cb4d9129a8e4
-P aab4b794b4238bad5c4a6aee7d4443732921127d
-R b2648c3d83df0dd5d82ceb6fe4e0bc60
+P a4af838f8d1b81ec6c8db97655c6876aca0738d9
+R a401956638c6d55c9de15d1b9c3564d6
 U danielk1977
-Z a958d50ee5923975cc30d387e46d379d
+Z d5bacfd02a451c5d78cf0909159519e5

diff --git a/manifest.uuid b/manifest.uuid
index e70830ee5720aa75460fd1f1bf2140b15f4f0655..f8e86d924a83e77abda7783671e1ae9a681b8784 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-a4af838f8d1b81ec6c8db97655c6876aca0738d9
\ No newline at end of file
+5cba8a510c0aeae740db695e960c60e5f6c303f5
\ No newline at end of file

diff --git a/src/build.c b/src/build.c
index 9ccba2b9871182e6668ddf435c67e9e57f3ba8ba..3f8dffa910976a61b17a1a5ae47576867897c00e 100644 (file)
--- a/src/build.c
+++ b/src/build.c
@@ -23,7 +23,7 @@
 **     ROLLBACK
 **     PRAGMA
 **
-** $Id: build.c,v 1.184 2004/05/16 11:15:36 danielk1977 Exp $
+** $Id: build.c,v 1.185 2004/05/16 11:57:28 danielk1977 Exp $
 */
 #include "sqliteInt.h"
 #include <ctype.h>
@@ -787,7 +787,7 @@ char sqlite3AffinityType(const char *zType, int nType){
     {"TEXT", 4, SQLITE_AFF_TEXT}
   };
 
-  for(n=0; n<(nType-3); n++){
+  for(n=0; n<(nType-2); n++){
     for(i=0; i<sizeof(substrings)/sizeof(substrings[0]); i++){
       if( 0==sqlite3StrNICmp(zType, substrings[i].zSub, substrings[i].nSub) ){
         return substrings[i].affinity;

diff --git a/src/expr.c b/src/expr.c
index 7fdd5e3ab4b059ffae2d66816ba9bc4ce565d161..05a38de056e67eb10ccb1145fb42459ea416a28c 100644 (file)
--- a/src/expr.c
+++ b/src/expr.c
@@ -12,7 +12,7 @@
 ** This file contains routines used for analyzing expressions and
 ** for generating VDBE code that evaluates expressions in SQLite.
 **
-** $Id: expr.c,v 1.118 2004/05/16 11:15:37 danielk1977 Exp $
+** $Id: expr.c,v 1.119 2004/05/16 11:57:28 danielk1977 Exp $
 */
 #include "sqliteInt.h"
 #include <ctype.h>
@@ -1098,7 +1098,7 @@ void sqlite3ExprCode(Parse *pParse, Expr *pExpr){
     case TK_INTEGER: {
       if( pExpr->op==TK_INTEGER && sqlite3FitsIn32Bits(pExpr->token.z) ){
         sqlite3VdbeAddOp(v, OP_Integer, atoi(pExpr->token.z), 0);
-      }else if( pExpr->op==TK_FLOAT ){
+      }else if( pExpr->op==TK_FLOAT || pExpr->op==TK_INTEGER ){
         sqlite3VdbeAddOp(v, OP_Real, 0, 0);
       }else{
         sqlite3VdbeAddOp(v, OP_String, 0, 0);

diff --git a/src/vdbe.c b/src/vdbe.c
index 32fb41f1c0067877d1e399ea265c8679c8b4774a..a66a291367c40fc9f5ddc742ee108ee8fedee09f 100644 (file)
--- a/src/vdbe.c
+++ b/src/vdbe.c
@@ -43,7 +43,7 @@
 ** in this file for details.  If in doubt, do not deviate from existing
 ** commenting and indentation practices when changing or adding code.
 **
-** $Id: vdbe.c,v 1.294 2004/05/16 11:15:40 danielk1977 Exp $
+** $Id: vdbe.c,v 1.295 2004/05/16 11:57:28 danielk1977 Exp $
 */
 #include "sqliteInt.h"
 #include "os.h"
@@ -1518,7 +1518,7 @@ case OP_Ge: {
   if( flags&MEM_Null ){
     popStack(&pTos, 2);
     if( pOp->p2 ){
-      if( pOp->p1 ) pc = pOp->p2-1;
+      if( (pOp->p1&0xFF) ) pc = pOp->p2-1;
     }else{
       pTos++;
       pTos->flags = MEM_Null;