Minor changes to get memsys5 compiling and its tests passing. Ticket #3495. (CVS...

FossilOrigin-Name: 96453ca16e90bc0c0cbfb75b3e39899f56d6ea66

diff --git a/manifest b/manifest
index 226d6e071d7c4bea855716e10afa34ecc30445cb..763d126773456d4b053e70151ff5759d682dcb0c 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Update\smksqlite3c.tcl\sto\sinclude\snew\sfile\spcache1.c.\s(CVS\s5900)
-D 2008-11-13T14:42:18
+C Minor\schanges\sto\sget\smemsys5\scompiling\sand\sits\stests\spassing.\sTicket\s#3495.\s(CVS\s5901)
+D 2008-11-13T16:21:50
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in 6cbc7db84c23804c368bc7ffe51367412212d7b2
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -124,7 +124,7 @@ F src/mem0.c f2f84062d1f35814d6535c9f9e33de3bfb3b132c
 F src/mem1.c 2091081d1c6bcd4516738f37cd84d42e814cf9a2
 F src/mem2.c 5d9968f576ba1babc787adbfb613cf428ab484ec
 F src/mem3.c 1594f117fde4cf11a6c16521f3f30af8d04bbe68
-F src/mem5.c 8cb9dfacf7e11a7822b4935757ae0c1749278b4e
+F src/mem5.c e7c814fd4cf32f27e5824b61eabbe290a11ef311
 F src/memjournal.c e2551e89243b39a972a1fbefeedaf4f74438a0cf
 F src/mutex.c e9cb5fbe94afb4328869afaf3ac49bd1327559eb
 F src/mutex.h 9e686e83a88838dac8b9c51271c651e833060f1e
@@ -459,8 +459,8 @@ F test/pager3.test 2323bf27fd5bd887b580247e5bce500ceee994b4
 F test/pageropt.test 3ee6578891baaca967f0bd349e4abfa736229e1a
 F test/pagesize.test 0d9ff3fedfce6e5ffe8fa7aca9b6d3433a2e843b
 F test/pcache.test 515b4c26e9f57660357dfff5b6b697acac1abc5f
-F test/pcache2.test e2260293e892190be65de89526dbc4f92c8b5a7c
-F test/permutations.test b1b15770940d954dbd874f3e6296ec321b81b5c6
+F test/pcache2.test 46efd980a89f737847b99327bda19e08fe11e402
+F test/permutations.test 6f2952820e43568d7b869d54f4c7140bc695a5f0
 F test/pragma.test 165372b62391d233715cde82d99f34d306f9257f
 F test/pragma2.test 5364893491b9231dd170e3459bfc2e2342658b47
 F test/printf.test 262a5acd3158f788e9bdf7f18d718f3af32ff6ef
@@ -657,7 +657,7 @@ F tool/speedtest16.c c8a9c793df96db7e4933f0852abb7a03d48f2e81
 F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
-P 47866d6708e9b69e367937fd85f93580fd025447
-R b464181d11d19fffc9b5c5320f3ff6f2
+P 00442e0f57b52808d087154c84ece531bf1cfb62
+R 55c7eb74cfa0f462485977c0a42894ee
 U danielk1977
-Z b9f9a6d1771a566373b56a593f54a83f
+Z e462aafc1f4434010beb9b02c9989486

diff --git a/manifest.uuid b/manifest.uuid
index 058f340bf7abde7adde2fc1515876311a64144d9..35d17753636fa53384b2c1bf7cbcd4e3c54d5f52 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-00442e0f57b52808d087154c84ece531bf1cfb62
\ No newline at end of file
+96453ca16e90bc0c0cbfb75b3e39899f56d6ea66
\ No newline at end of file

diff --git a/src/mem5.c b/src/mem5.c
index 1243849c6f63115366944b296257826cc3120e97..43136027904cea70fd62e8a90ba1d90bb052ae18 100644 (file)
--- a/src/mem5.c
+++ b/src/mem5.c
@@ -23,7 +23,7 @@
 ** This version of the memory allocation subsystem is included
 ** in the build only if SQLITE_ENABLE_MEMSYS5 is defined.
 **
-** $Id: mem5.c,v 1.15 2008/10/28 18:58:20 drh Exp $
+** $Id: mem5.c,v 1.16 2008/11/13 16:21:50 danielk1977 Exp $
 */
 #include "sqliteInt.h"
 
@@ -213,7 +213,6 @@ static void *memsys5MallocUnsafe(int nByte){
   }
 
   /* Round nByte up to the next valid power of two */
-  if( nByte>POW2_MAX ) return 0;
   for(iFullSz=mem5.nAtom, iLogsize=0; iFullSz<nByte; iFullSz *= 2, iLogsize++){}
 
   /* Make sure mem5.aiFreelist[iLogsize] contains at least one free

diff --git a/test/pcache2.test b/test/pcache2.test
index 73880e53fbc2f8975370749288c4e977b8dee0a8..dc39e8e121700f06fad6aea799275f12fa224943 100644 (file)
--- a/test/pcache2.test
+++ b/test/pcache2.test
@@ -11,7 +11,7 @@
 #
 # This file is focused on testing the pcache module.
 #
-# $Id: pcache2.test,v 1.2 2008/10/14 19:21:52 danielk1977 Exp $
+# $Id: pcache2.test,v 1.3 2008/11/13 16:21:50 danielk1977 Exp $
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
@@ -22,9 +22,11 @@ source $testdir/tester.tcl
 #
 do_test pcache2-1.1 {
   db close
+  sqlite3_reset_auto_extension
   sqlite3_shutdown
   sqlite3_config_pagecache 6000 100
   sqlite3_initialize
+  autoinstall_test_functions
   sqlite3_status SQLITE_STATUS_PAGECACHE_USED 1
   sqlite3_status SQLITE_STATUS_PAGECACHE_USED 0
 } {0 0 0}
@@ -68,6 +70,10 @@ do_test pcache2-1.4 {
 
 db close
 catch {db2 close}
+sqlite3_reset_auto_extension
 sqlite3_shutdown
 sqlite3_config_pagecache 0 0
+sqlite3_initialize
+autoinstall_test_functions
+
 finish_test

diff --git a/test/permutations.test b/test/permutations.test
index a42bea01917ea26a6fda9a5426f233b52947352c..bec84e9938bea2506389f105f0367ab632e689dc 100644 (file)
--- a/test/permutations.test
+++ b/test/permutations.test
@@ -9,7 +9,7 @@
 #
 #***********************************************************************
 #
-# $Id: permutations.test,v 1.37 2008/11/10 18:05:36 shane Exp $
+# $Id: permutations.test,v 1.38 2008/11/13 16:21:50 danielk1977 Exp $
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
@@ -505,7 +505,7 @@ ifcapable mem5 {
     bitvec.test               index2.test               memsubsys1.test
     capi3c.test               ioerr.test                memsubsys2.test
     capi3.test                join3.test                pagesize.test
-    collate5.test             limit.test
+    collate5.test             limit.test                zeroblob.test
   } -initialize {
     catch {db close}
     sqlite3_reset_auto_extension