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

FossilOrigin-Name: 5cba8a510c0aeae740db695e960c60e5f6c303f5
diff --git a/src/expr.c b/src/expr.c
index 7fdd5e3..05a38de 100644
--- 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 @@
     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);