1 files changed, 14 insertions, 12 deletions

diff --git a/test/malloc4.test b/test/malloc4.test
index 1ce95b924..1d8ad0eb6 100644
--- a/test/malloc4.test
+++ b/test/malloc4.test
@@ -12,7 +12,7 @@
 # This file contains tests to ensure that the library handles malloc() failures
 # correctly. The emphasis in this file is on sqlite3_column_XXX() APIs.
 #
-# $Id: malloc4.test,v 1.4 2007/08/22 22:04:37 drh Exp $
+# $Id: malloc4.test,v 1.5 2007/08/23 02:47:53 drh Exp $
 
 #---------------------------------------------------------------------------
 # NOTES ON EXPECTED BEHAVIOUR
@@ -69,26 +69,28 @@ proc do_stmt_test {id sql} {
     # about explicitly testing them.
     #
     do_test ${testid}.2.1 {
-      set mf1 [expr [sqlite3_memdebug_pending] <= 0]
+      set mf1 [expr [sqlite3_memdebug_pending] < 0]
       set ::name8  [sqlite3_column_name $::STMT 0]
-      set mf2 [expr [sqlite3_memdebug_pending] <= 0]
+      set mf2 [expr [sqlite3_memdebug_pending] < 0]
       expr {$mf1 == $mf2 || $::name8 == ""}
     } {1}
     do_test ${testid}.2.2 {
-      set mf1 [expr [sqlite3_memdebug_pending] <= 0]
+      set mf1 [expr [sqlite3_memdebug_pending] < 0]
+btree_breakpoint
       set ::name16 [sqlite3_column_name16 $::STMT 0]
       set ::name16 [encoding convertfrom unicode $::name16]
       set ::name16 [string range $::name16 0 end-1]
-      set mf2 [expr [sqlite3_memdebug_pending] <= 0]
+      set mf2 [expr [sqlite3_memdebug_pending] < 0]
+puts [list $mf1 $mf2 $::name16]
       expr {$mf1 == $mf2 || $::name16 == ""}
     } {1}
     do_test ${testid}.2.3 {
-      set mf1 [expr [sqlite3_memdebug_pending] <= 0]
+      set mf1 [expr [sqlite3_memdebug_pending] < 0]
       set ::name8_2 [sqlite3_column_name $::STMT 0]
-      set mf2 [expr [sqlite3_memdebug_pending] <= 0]
+      set mf2 [expr [sqlite3_memdebug_pending] < 0]
       expr {$mf1 == $mf2 || $::name8_2 == ""}
     } {1}
-    set ::mallocFailed [expr [sqlite3_memdebug_pending] <= 0]
+    set ::mallocFailed [expr [sqlite3_memdebug_pending] < 0]
     do_test ${testid}.2.4 {
       expr {
         $::name8 == $::name8_2 && $::name16 == $::name8 && !$::mallocFailed ||
@@ -113,19 +115,19 @@ proc do_stmt_test {id sql} {
     #
     do_test ${testid}.4.1 {
       set ::text8 [sqlite3_column_text $::STMT 0]
-      set mf [expr [sqlite3_memdebug_pending] <= 0 && !$::mallocFailed]
+      set mf [expr [sqlite3_memdebug_pending] < 0 && !$::mallocFailed]
       expr {$mf==0 || $::text8 == ""}
     } {1}
     do_test ${testid}.4.2 {
       set ::text16 [sqlite3_column_text16 $::STMT 0]
       set ::text16 [encoding convertfrom unicode $::text16]
       set ::text16 [string range $::text16 0 end-1]
-      set mf [expr [sqlite3_memdebug_pending] <= 0 && !$::mallocFailed]
+      set mf [expr [sqlite3_memdebug_pending] < 0 && !$::mallocFailed]
       expr {$mf==0 || $::text16 == ""}
     } {1}
     do_test ${testid}.4.3 {
       set ::text8_2 [sqlite3_column_text $::STMT 0]
-      set mf [expr [sqlite3_memdebug_pending] <= 0 && !$::mallocFailed]
+      set mf [expr [sqlite3_memdebug_pending] < 0 && !$::mallocFailed]
       expr {$mf==0 || $::text8_2 == "" || ($::text16 == "" && $::text8 != "")}
     } {1}
 
@@ -156,7 +158,7 @@ proc do_stmt_test {id sql} {
     } {0.0}
 
     set mallocFailedAfterStep [expr \
-      [sqlite3_memdebug_pending] <= 0 && !$::mallocFailed
+      [sqlite3_memdebug_pending] < 0 && !$::mallocFailed
     ]
 
     sqlite3_memdebug_fail -1