Repair typo in previous commit. (CVS 2849)

FossilOrigin-Name: a4aa0911bccd0627cd6d926c5bdd2a4f4b8f6cc5

diff --git a/manifest b/manifest
index a68fc8f0ccfe960c74d80672dee42891cbb76f08..7c051fab78d0124a4f8c7454b5fdb3044bc03417 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\spart\sof\sthe\sbtree\slayer\sof\sthe\sshared-cache\sfeature.\s(CVS\s2848)
-D 2005-12-30T16:28:02
+C Repair\stypo\sin\sprevious\scommit.\s(CVS\s2849)
+D 2005-12-30T16:31:54
 F Makefile.in e3c6b3a38d734d41574c04f2fc90d18de2b87102
 F Makefile.linux-gcc aee18d8a05546dcf1888bd4547e442008a49a092
 F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028
@@ -34,7 +34,7 @@ F src/alter.c 5905a3372379daa4f860199452b4de5a836e53f3
 F src/analyze.c ea42005eed52c382fcc7ef66969e7f1858597633
 F src/attach.c 07822dbd2dcf6de548aba6cb24142aec800fa3b6
 F src/auth.c 31e2304bef67f44d635655f44234387ea7d21454
-F src/btree.c ccb912b1f27b6de4ed9f8ab5289a5491c9be5bc8
+F src/btree.c ec89192ceeae9343c5d8f2564b8c9b8c958e6bfc
 F src/btree.h d6481f9253f0b5fa40b35da4b93a54d0f9c5f9f2
 F src/build.c bb4c9df2583246728167659d401fd75aa3d9997f
 F src/callback.c 62066afd516f220575e81b1a1239ab92a2eae252
@@ -332,7 +332,7 @@ F www/tclsqlite.tcl ddcf912ea48695603c8ed7efb29f0812ef8d1b49
 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
 F www/version3.tcl a99cf5f6d8bd4d5537584a2b342f0fb9fa601d8b
 F www/whentouse.tcl 97e2b5cd296f7d8057e11f44427dea8a4c2db513
-P 0bd9e35fd22946640f4fb1c1874922ae096916f7
-R 4baca77991845360aad68bb03e406c8e
+P 2afcad990190af97d1ad0010f211a5ca8f0fd745
+R a424e10a9f0c619045afb8d75245a73e
 U danielk1977
-Z 2dfbc30edccb7b747e04832859ba5105
+Z 3408bf2c5f10e96359ff6870ee5c171c

diff --git a/manifest.uuid b/manifest.uuid
index a15a1d6ddf5acc1f67c5300834413a6378ab3292..cc1b0d6d12da7bd601f092f267fde915919a97d1 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-2afcad990190af97d1ad0010f211a5ca8f0fd745
\ No newline at end of file
+a4aa0911bccd0627cd6d926c5bdd2a4f4b8f6cc5
\ No newline at end of file

diff --git a/src/btree.c b/src/btree.c
index e3febe981855fabe00b88ed9ea9224728ef273ad..7e5314b581e193d1fe41cd65174a649e57489cf0 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.277 2005/12/30 16:28:02 danielk1977 Exp $
+** $Id: btree.c,v 1.278 2005/12/30 16:31:54 danielk1977 Exp $
 **
 ** This file implements a external (disk-based) database using BTrees.
 ** For a detailed discussion of BTrees, refer to
@@ -531,7 +531,9 @@ static int lockTable(Btree *p, Pgno iTable, u8 eLock){
   ** and a read-lock requested, we don't incorrectly downgrade the lock.
   */
   assert( WRITE_LOCK>READ_LOCK );
-  pLock->eLock = MAX(pLock->eLock, eLock);
+  if( eLock>pLock->eLock ){
+    pLock->eLock = eLock;
+  }
 
   return SQLITE_OK;
 }