Fix a bug in where8.test causing a tcl exception. (CVS 6082)

FossilOrigin-Name: 495b569a3921042c36667a415c1353201760fa17

diff --git a/manifest b/manifest
index c44a076e3040a41a7efbffb438a879702700fd05..ac2a4b028cba25526015703a443129b2bd334fbf 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\sa\sfew\smore\stests\sto\swhere8.test.\s(CVS\s6081)
-D 2008-12-30T15:26:30
+C Fix\sa\sbug\sin\swhere8.test\scausing\sa\stcl\sexception.\s(CVS\s6082)
+D 2008-12-30T15:51:41
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in 77635d0909c2067cee03889a1e04ce910d8fb809
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -656,7 +656,7 @@ F test/where4.test e9b9e2f2f98f00379e6031db6a6fca29bae782a2
 F test/where5.test fdf66f96d29a064b63eb543e28da4dfdccd81ad2
 F test/where6.test 42c4373595f4409d9c6a9987b4a60000ad664faf
 F test/where7.test c56c34e84f2bf8d4c787cf8ee6ce8b705468b8cb
-F test/where8.test f569052bbcb1a4cdf51253601a5f842ef7214596
+F test/where8.test 680fc5278a77709afd80526bbae0a326628d3184
 F test/where8m.test c1010d61826412ff66abd29bfb32e5d6b37d965c
 F test/wherelimit.test 5e9fd41e79bb2b2d588ed999d641d9c965619b31
 F test/zeroblob.test 792124852ec61458a2eb527b5091791215e0be95
@@ -688,7 +688,7 @@ F tool/speedtest16.c c8a9c793df96db7e4933f0852abb7a03d48f2e81
 F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
-P eb9ba5fe70df56ee00828f7dbaf71ae6f825737d
-R be8fa39373cf50cd69d05e36043c5b90
+P ac28aa8b618d59628c5b8fc6fe649ec14f554b11
+R ff8796835ba883e74d2419a85be100d0
 U danielk1977
-Z a0d645d228413702b70dae200239a68c
+Z f6786d2448cb48676272fa103a43dbba

diff --git a/manifest.uuid b/manifest.uuid
index 0f0c29c5bd0c0ac72ca790747d9cdf21363c59dc..9457636534754724eeab4043e646ad7d6f798390 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-ac28aa8b618d59628c5b8fc6fe649ec14f554b11
\ No newline at end of file
+495b569a3921042c36667a415c1353201760fa17
\ No newline at end of file

diff --git a/test/where8.test b/test/where8.test
index eacc0b472e7ce31a35c8e5569353d07fa8b71bbc..d484c9ce7e0a54d6ae53ed20ce8e5c48bf279ccb 100644 (file)
--- a/test/where8.test
+++ b/test/where8.test
@@ -12,7 +12,7 @@
 # is testing of where.c. More specifically, the focus is the optimization
 # of WHERE clauses that feature the OR operator.
 #
-# $Id: where8.test,v 1.3 2008/12/30 15:26:30 danielk1977 Exp $
+# $Id: where8.test,v 1.4 2008/12/30 15:51:41 danielk1977 Exp $
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
@@ -404,6 +404,9 @@ do_test where8-4.1 {
 } {}
 
 catch {unset results}
+catch {unset A}
+catch {unset B}
+
 set A 2
 foreach idxsql {
   { 
@@ -473,5 +476,9 @@ foreach idxsql {
   incr A
 }
 
+catch {unset results}
+catch {unset A}
+catch {unset B}
+
 finish_test