Fix compiler warning in MSVC. (CVS 6371)

FossilOrigin-Name: 83a4d5b3d7abe983c2be00a694cc7d4c4847f253

diff --git a/manifest b/manifest
index 42f0becce0d1ea4ca26fcc450e6b0c1468c82610..175f8094dd81e183b8c9a1766a1c1b94d6e6386b 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Allow\sthe\skeyword\sINDEXED\sto\sbe\sused\sas\sthe\sname\sof\sa\stable\sor\sindex\sor\ncolumn\s-\sfor\sbackwards\scompatibility.\s(CVS\s6370)
-D 2009-03-22T20:36:19
+C Fix\scompiler\swarning\sin\sMSVC.\s(CVS\s6371)
+D 2009-03-23T02:34:32
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in 583e87706abc3026960ed759aff6371faf84c211
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -103,7 +103,7 @@ F src/auth.c c8b2ab5c8bad4bd90ed7c294694f48269162c627
 F src/backup.c 0082d0e5a63f04e88faee0dff0a7d63d3e92a78d
 F src/bitvec.c 44f7059ac1f874d364b34af31b9617e52223ba75
 F src/btmutex.c 341502bc496dc0840dcb00cde65680fb0e85c3ab
-F src/btree.c 4fbb5f26f450bee7356ec63cb664c8d733e28d89
+F src/btree.c 1a709b6aac17e520de49b6cbad5cc14000910d8b
 F src/btree.h e302c5747494067cd4f5763000fbe7bca767d816
 F src/btreeInt.h df64030d632f8c8ac217ed52e8b6b3eacacb33a5
 F src/build.c f217f9ce2528c5b968f77a11998948466ea81bc9
@@ -709,7 +709,7 @@ F tool/speedtest16.c c8a9c793df96db7e4933f0852abb7a03d48f2e81
 F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
-P a915e8e0a429ab6a10536c45264a790c2d076461
-R 1162241df47288b20352f997466915d0
-U drh
-Z 145cbd00e8dda3a6879518186372f565
+P 53149c9f5d5cfaba3374703cd3af92a9d4cf8718
+R 7594c1241f5f5ff5987bb39db6374524
+U shane
+Z 7711d30d6a1e9899b7dbb6fec4505945

diff --git a/manifest.uuid b/manifest.uuid
index 6af0659470d2256aa43ee8d622a79eead9fd5261..40342278e5729716c72455624915e1acb437d615 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-53149c9f5d5cfaba3374703cd3af92a9d4cf8718
\ No newline at end of file
+83a4d5b3d7abe983c2be00a694cc7d4c4847f253
\ No newline at end of file

diff --git a/src/btree.c b/src/btree.c
index 68d87aa1eabd107b10ccc69a05fe2a7708a70604..b293207d8df68c80c7b1579afa5b8944f465eef9 100644 (file)
--- a/src/btree.c
+++ b/src/btree.c
@@ -9,7 +9,7 @@
 **    May you share freely, never taking more than you give.
 **
 *************************************************************************
-** $Id: btree.c,v 1.576 2009/03/20 13:15:30 drh Exp $
+** $Id: btree.c,v 1.577 2009/03/23 02:34:32 shane Exp $
 **
 ** This file implements a external (disk-based) database using BTrees.
 ** See the header comment on "btreeInt.h" for additional information.
@@ -2167,7 +2167,7 @@ int sqlite3BtreeBeginTrans(Btree *p, int wrflag){
     if( wrflag ){
       assert( !pBt->pWriter );
       pBt->pWriter = p;
-      pBt->isExclusive = (wrflag>1);
+      pBt->isExclusive = (u8)(wrflag>1);
     }
 #endif
   }