Make the minimum allocate size for RowSet objects large enough to accommodate

8-byte pointers. (CVS 5985)

FossilOrigin-Name: b74885e0856c46412f7cf4dca4cafb740cb9a28b

diff --git a/manifest b/manifest
index 844fb712e6e7802ed40498428d1d84edd58ec192..8e66367b5c5ed5b94ba13c513fa7e3596e04f00c 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sintegrity\scheck\sso\sthat\sit\salways\sreports\smemory\sallocation\serrors\sthat\nit\sencounters.\s(CVS\s5984)
-D 2008-12-05T22:40:08
+C Make\sthe\sminimum\sallocate\ssize\sfor\sRowSet\sobjects\slarge\senough\sto\saccommodate\n8-byte\spointers.\s(CVS\s5985)
+D 2008-12-05T23:40:23
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in f7e4c81c347b04f7b0f1c1b081a168645d7b8af7
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -200,7 +200,7 @@ F src/vdbeInt.h 1df957ab0f6a129735513d528c930dddfb4b23ef
 F src/vdbeapi.c 20722164e7701a0747eaea03cddbbe0de5cb37bf
 F src/vdbeaux.c 9db6b1eb6732ee83afb201b655ff55ff40d3d885
 F src/vdbeblob.c b0dcebfafedcf9c0addc7901ad98f6f986c08935
-F src/vdbemem.c 360396ac77b2da36a8cfc280e7c055482f0254e8
+F src/vdbemem.c c4da6cee44bbd6e4ecc0129d76330fb16c29d432
 F src/vtab.c 02c51eac45dbff1a1d6e73f58febf92ecb563f7f
 F src/walker.c 488c2660e13224ff70c0c82761118efb547f8f0d
 F src/where.c d27611213e9fcbe99f4158bffd7c917a2b8672f0
@@ -663,7 +663,7 @@ F tool/speedtest16.c c8a9c793df96db7e4933f0852abb7a03d48f2e81
 F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
-P bfde3dae0c7b97308344519ca06cd4b290e8cf47
-R 8fe45c4a428cb7057f5995a2ae76463c
+P 2a3f5ce14c050b135ab9d2247aee84ca37882c4b
+R efe8c4473ee08146a9eec908055013bb
 U drh
-Z 3fd0d7ace73b7317cc5c4ac931c0196d
+Z 7ac988f57789a018d22ba18a4c2f1c55

diff --git a/manifest.uuid b/manifest.uuid
index e4694232c9696eaca3b932e751a25610e72fb48b..e890fc4f4faa1893ab5c65c23941e24f7c56fa43 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-2a3f5ce14c050b135ab9d2247aee84ca37882c4b
\ No newline at end of file
+b74885e0856c46412f7cf4dca4cafb740cb9a28b
\ No newline at end of file

diff --git a/src/vdbemem.c b/src/vdbemem.c
index ffe2e15437d1c14161914e06f6f9a5cbe62e2cef..aa2aadc073393c97953f8c747fc0acaf970ee4ab 100644 (file)
--- a/src/vdbemem.c
+++ b/src/vdbemem.c
@@ -15,7 +15,7 @@
 ** only within the VDBE.  Interface routines refer to a Mem using the
 ** name sqlite_value
 **
-** $Id: vdbemem.c,v 1.128 2008/12/04 22:17:56 drh Exp $
+** $Id: vdbemem.c,v 1.129 2008/12/05 23:40:23 drh Exp $
 */
 #include "sqliteInt.h"
 #include <ctype.h>
@@ -508,7 +508,7 @@ void sqlite3VdbeMemSetRowSet(Mem *pMem){
     sqlite3RowSetClear(pMem->u.pRowSet);
   }else{
     sqlite3VdbeMemRelease(pMem);
-    pMem->zMalloc = sqlite3DbMallocRaw(db, 32);
+    pMem->zMalloc = sqlite3DbMallocRaw(db, 64);
   }
   if( db->mallocFailed ){
     pMem->flags = MEM_Null;