diff options
-rw-r--r-- | manifest | 16 | ||||
-rw-r--r-- | manifest.uuid | 2 | ||||
-rw-r--r-- | src/expr.c | 4 | ||||
-rw-r--r-- | src/sqliteInt.h | 8 |
4 files changed, 17 insertions, 13 deletions
@@ -1,5 +1,5 @@ -C Fixed\sincorrect\stypecast\sfor\sflock\sstructure\sptr\sin\sfcntl()\scall\sin\ssqlite3TestLockingStyle()\nRestored\sprevious\sfullfsync\sbehavior,\stry\sfsync()\sif\sfcntl(fd,\sF_FULLFSYNC,\s0)\sreturns\san\serror.\s(CVS\s3621) -D 2007-01-31T23:37:08 +C Allow\sup\sto\s64\stables\sin\sa\sjoin\s(the\snumber\sof\sbits\sin\sa\slong\slong\sint).\nThe\sold\slimit\swas\s32\stables.\s(CVS\s3622) +D 2007-02-01T01:40:44 F Makefile.in 7fa74bf4359aa899da5586e394d17735f221315f F Makefile.linux-gcc 2d8574d1ba75f129aba2019f0b959db380a90935 F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028 @@ -65,7 +65,7 @@ F src/complete.c 7d1a44be8f37de125fcafd3d3a018690b3799675 F src/date.c 393c73fc027597e008dcd81454544659e978b05c F src/delete.c 804384761144fe1a5035b99f4bd7d706976831bd F src/experimental.c 1b2d1a6cd62ecc39610e97670332ca073c50792b -F src/expr.c 3d2cf15fd9aa6b60b67f45504782cce72cd07963 +F src/expr.c ec0b5d9dd6f69425302c255d88475511f5d8b5c9 F src/func.c b7e1e220a6795ecae7649815145ea5f8644dfa5f F src/hash.c 449f3d6620193aa557f5d86cbc5cc6b87702b185 F src/hash.h 1b3f7e2609141fd571f62199fc38687d262e9564 @@ -97,7 +97,7 @@ F src/server.c 087b92a39d883e3fa113cae259d64e4c7438bc96 F src/shell.c d13ca007cd18192c07a668aeddcdd6a9fe639be9 F src/sqlite.h.in 6b7383baf76070214f6381f603328ca9b22a7fae F src/sqlite3ext.h 011c75fd6459a61454514af07c7a4f1f5c767f27 -F src/sqliteInt.h f15bb7b1bcf750a3202bfae85d6d3beb4e5f64e1 +F src/sqliteInt.h f6053066ba92ed66507661fe6a78c31ca856b6f8 F src/table.c 6d0da66dde26ee75614ed8f584a1996467088d06 F src/tclsqlite.c d344c7f394d6f055ce3abfe0049b0480c5e34e56 F src/test1.c 053f5224697efaefff1f4c647fd90fdea9346cc5 @@ -428,7 +428,7 @@ F www/tclsqlite.tcl bb0d1357328a42b1993d78573e587c6dcbc964b9 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0 F www/version3.tcl 890248cf7b70e60c383b0e84d77d5132b3ead42b F www/whentouse.tcl 97e2b5cd296f7d8057e11f44427dea8a4c2db513 -P f5ad74a9bc57e83c11beb3cf46bb6cd8c9de3f86 -R d922c31b26825f5a2b46c299309ad84f -U aswift -Z e656fc55ef70643d3663c6aa79db09b7 +P f044c5f49f116ede8ab2d5ab43caa5ca9dd54ffe +R 36fdefad905f52a7af46f62a3c9bcce2 +U drh +Z 18bdd43e8aebf3c5fe6ff2fcec51977d diff --git a/manifest.uuid b/manifest.uuid index dffff041c..3182079a5 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -f044c5f49f116ede8ab2d5ab43caa5ca9dd54ffe
\ No newline at end of file +505dce8f4e8717341e04f49f6f382719c3c704f1
\ No newline at end of file diff --git a/src/expr.c b/src/expr.c index aa70bdd9c..a20e1541c 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.271 2007/01/04 01:20:29 drh Exp $ +** $Id: expr.c,v 1.272 2007/02/01 01:40:44 drh Exp $ */ #include "sqliteInt.h" #include <ctype.h> @@ -1046,7 +1046,7 @@ static int lookupName( n = sizeof(Bitmask)*8-1; } assert( pMatch->iCursor==pExpr->iTable ); - pMatch->colUsed |= 1<<n; + pMatch->colUsed |= ((Bitmask)1)<<n; } lookupname_end: diff --git a/src/sqliteInt.h b/src/sqliteInt.h index a6c944f01..bd1430024 100644 --- a/src/sqliteInt.h +++ b/src/sqliteInt.h @@ -11,7 +11,7 @@ ************************************************************************* ** Internal interface definitions for SQLite. ** -** @(#) $Id: sqliteInt.h,v 1.533 2007/01/19 01:06:02 drh Exp $ +** @(#) $Id: sqliteInt.h,v 1.534 2007/02/01 01:40:44 drh Exp $ */ #ifndef _SQLITEINT_H_ #define _SQLITEINT_H_ @@ -1078,8 +1078,12 @@ struct IdList { /* ** The bitmask datatype defined below is used for various optimizations. +** +** Changing this from a 64-bit to a 32-bit type limits the number of +** tables in a join to 32 instead of 64. But it also reduces the size +** of the library by 738 bytes on ix86. */ -typedef unsigned int Bitmask; +typedef u64 Bitmask; /* ** The following structure describes the FROM clause of a SELECT statement. |