Fix issue with several memory allocation tests due to KeyInfo allocations now being...

FossilOrigin-Name: 569fedd6bb07bdd3430da8dc65de4a9fdfe204cc

diff --git a/manifest b/manifest
index 04a65fcd0cdfb59ea63c65540b069f302e3d0374..bc90d95238c398951a7f9441e2369c0bf7529935 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Convert\sseveral\sALWAYS()\smacros\sin\svdbe.c\sinto\sassert()\sstatements.
-D 2013-11-11T03:24:11.697
+C Fix\sissue\swith\sseveral\smemory\sallocation\stests\sdue\sto\sKeyInfo\sallocations\snow\sbeing\sshared.
+D 2013-11-11T03:37:04.887
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in d12e4455cf7a36e42d3949876c1c3b88ff70867a
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -419,7 +419,7 @@ F test/createtab.test b5de160630b209c4b8925bdcbbaf48cc90b67fe8
 F test/cse.test 277350a26264495e86b1785f34d2d0c8600e021c
 F test/ctime.test 7bd009071e242aac4f18521581536b652b789a47
 F test/date.test 42973251b9429f2c41b77eb98a7b0b0ba2d3b2c0
-F test/dbstatus.test aee30c3f337e6c217ff06df59fb8fe6e6448dce2
+F test/dbstatus.test 8de104bb5606f19537d23cd553b41349b5ab1204
 F test/dbstatus2.test 10418e62b3db5dca070f0c3eef3ea13946f339c2
 F test/default.test 6faf23ccb300114924353007795aa9a8ec0aa9dc
 F test/delete.test a065b05d2ebf60fd16639c579a4adfb7c381c701
@@ -1135,7 +1135,7 @@ F tool/vdbe-compress.tcl f12c884766bd14277f4fcedcae07078011717381
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh d1a6de74685f360ab718efda6265994b99bbea01
 F tool/win/sqlite.vsix 030f3eeaf2cb811a3692ab9c14d021a75ce41fff
-P e6ff492f0d475c395b82e2b3b294155674d4c6d1
-R 475d55de2c4ca401ff801162b73639ef
-U drh
-Z 5df113c36f23c015c44c7ae86b17359f
+P acc40ff6b47595432ebc1b3ec71ac50384bec323
+R 8599d4c7dd668f68912fe04c74a25e4b
+U mistachkin
+Z c9f89e24ee5e7a1e18183aaf2ca68e49

diff --git a/manifest.uuid b/manifest.uuid
index 59c158a59a9e90b6dc5337914c36b8def1c3066d..94808e0f7d53dce6f9bfb7f8b8b3ff7e599127b0 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-acc40ff6b47595432ebc1b3ec71ac50384bec323
\ No newline at end of file
+569fedd6bb07bdd3430da8dc65de4a9fdfe204cc
\ No newline at end of file

diff --git a/test/dbstatus.test b/test/dbstatus.test
index c22fe15d4370911c7bc955cbe435d6597b5eaca7..368c6b28e59a3f806b07a96ef053f08304a1ec9f 100644 (file)
--- a/test/dbstatus.test
+++ b/test/dbstatus.test
@@ -134,7 +134,7 @@ foreach ::lookaside_buffer_size {0 64 120} {
       CREATE TABLE t2(c, d);
       CREATE VIEW v1 AS SELECT * FROM t1 UNION SELECT * FROM t2;
     }
-    6y {
+    6k {
       CREATE TABLE t1(a, b);
       CREATE INDEX i1 ON t1(a);
       CREATE INDEX i2 ON t1(a,b);
@@ -204,6 +204,11 @@ foreach ::lookaside_buffer_size {0 64 120} {
     set nSchema4 [lindex [sqlite3_db_status db SQLITE_DBSTATUS_SCHEMA_USED 0] 1]
     set nFree [expr {$nAlloc1-$nAlloc2}]
     
+    # Tests for which the test name ends in an "k" report slightly less
+    # memory than is actually freed when all schema items are finalized.
+    # This is because memory allocated by KeyInfo objects is no longer
+    # counted as "schema memory".
+    #
     # Tests for which the test name ends in an "x" report slightly less
     # memory than is actually freed when all schema items are finalized.
     # This is because memory allocated by virtual table implementations
@@ -220,7 +225,8 @@ foreach ::lookaside_buffer_size {0 64 120} {
     # Finally, on osx the estimate of memory used by the schema may be
     # slightly low. 
     #
-    if {[string match *x $tn] || $AUTOVACUUM
+    if {[string match *k $tn]
+         || [string match *x $tn] || $AUTOVACUUM
          || ([string match *y $tn] && $STAT3)
          || ($::tcl_platform(os) == "Darwin")
     } {
@@ -246,7 +252,7 @@ foreach ::lookaside_buffer_size {0 64 120} {
   #      lookaside memory allocated by SQLite, and the memory allocated 
   #      for the prepared statements according to sqlite3_db_status().
   #
-  #   3. Finalize all prepared statements Measure the total memory 
+  #   3. Finalize all prepared statements. Measure the total memory 
   #      and the prepared statement memory again.
   #
   #   4. Repeat step 2.