Round lookaside buffer sizes in the right direction. Ticket #3277. (CVS 5547)

FossilOrigin-Name: c1a9bf3863b7bcc69885e4637f18c6532075f982

diff --git a/manifest b/manifest
index 7796057869859b06a937388eb0a17603bbccf692..0604fdbf0c91d6cbffc198f5a8b9a3db36aed033 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Disallow\sthe\sON\sCONFLICT\sclause\son\sCHECK\sconstraints.\s\sThe\ssyntax\sused\sto\sbe\nallowed\sbut\snever\sworked,\sso\sthis\sshould\snot\spresent\scompatibility\sproblems.\nOther\sinternal\sgrammar\ssimplifications.\s(CVS\s5546)
-D 2008-08-08T14:19:41
+C Round\slookaside\sbuffer\ssizes\sin\sthe\sright\sdirection.\s\sTicket\s#3277.\s(CVS\s5547)
+D 2008-08-08T14:33:13
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in 2713ea64947be3b35f35d9a3158bb8299c90b019
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -115,7 +115,7 @@ F src/insert.c 89cd9af52a5ea6fb7d0cfc9c3b935d6406c360c4
 F src/journal.c cffd2cd214e58c0e99c3ff632b3bee6c7cbb260e
 F src/legacy.c aac57bd984e666059011ea01ec4383892a253be3
 F src/loadext.c eb1fe4f44d7c8ff53fc0c6a4388ab79fbd34cd64
-F src/main.c d750c6c0d381252851401f6ea2ee72185de005ed
+F src/main.c 9707706f62adc7a6830f7128eaaae6f3410046ae
 F src/malloc.c 22c68fc62f0c2df0f1deb8cd9a5ea968f995cac2
 F src/md5.c 008216bbb5d34c6fbab5357aa68575ad8a31516a
 F src/mem1.c 3a7fe31d8290baa3bb203af72f7dfd6323966bcd
@@ -617,7 +617,7 @@ F tool/speedtest16.c c8a9c793df96db7e4933f0852abb7a03d48f2e81
 F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 1dbced29de5f59ba2ebf877edcadf171540374d1
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
-P 732657c6a639bdf71a3341f6747d19298d442ddb
-R a8dbe9c0297be9af2808d9fc7cbb821d
+P 4cedc641ed39982ae8cbb9200aa1e2f37c878b73
+R 01f00fc1811b3bcf6084576543aedf2f
 U drh
-Z c51d96114f2cd9514587cda1bec559ff
+Z 42d29333f3f39fd281bf48965af060b7

diff --git a/manifest.uuid b/manifest.uuid
index ab8e704957daa1dc20388627eb2cf2d99476b203..2e3693d8b818bbb2646691ea89d48cf757c3e432 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-4cedc641ed39982ae8cbb9200aa1e2f37c878b73
\ No newline at end of file
+c1a9bf3863b7bcc69885e4637f18c6532075f982
\ No newline at end of file

diff --git a/src/main.c b/src/main.c
index 68500eb1a9026d0bbdf50168a679220d85f068c5..e23a01012614107d68863d46cc3fae27d243736a 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -14,7 +14,7 @@
 ** other files are for internal use by SQLite and should not be
 ** accessed by users of the library.
 **
-** $Id: main.c,v 1.486 2008/08/04 20:13:27 drh Exp $
+** $Id: main.c,v 1.487 2008/08/08 14:33:13 drh Exp $
 */
 #include "sqliteInt.h"
 #include <ctype.h>
@@ -308,12 +308,13 @@ static int setupLookaside(sqlite3 *db, void *pBuf, int sz, int cnt){
   }
   if( sz<0 ) sz = 0;
   if( cnt<0 ) cnt = 0;
-  sz = (sz+7)&~7;
   if( pBuf==0 ){
+    sz = (sz + 7)&~7;
     sqlite3BeginBenignMalloc();
     pStart = sqlite3Malloc( sz*cnt );
     sqlite3EndBenignMalloc();
   }else{
+    sz = sz&~7;
     pStart = pBuf;
   }
   if( db->lookaside.bMalloced ){