Fix missing info exists check for win32lock-2.2 (the one previously applied to win32l...

FossilOrigin-Name: 8a52698e642f40a32d09a6a00b63f25ac38f3fda

diff --git a/manifest b/manifest
index 8d774565a20e2f9149663b34ac8c2f481d473fff..c460c26c053431cd1e12ec88642d86b57cfd93e8 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Replace\sthe\smissed\s'file\scopy'\sin\smalloc_common.tcl\swith\scopy_file.
-D 2011-08-02T20:03:36.125
+C Fix\smissing\sinfo\sexists\scheck\sfor\swin32lock-2.2\s(the\sone\spreviously\sapplied\sto\swin32lock-1.2).
+D 2011-08-02T20:19:48.906
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 1e6988b3c11dee9bd5edc0c804bd4468d74a9cdc
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -913,7 +913,7 @@ F test/where9.test 24f19ad14bb1b831564ced5273e681e495662848
 F test/whereA.test 24c234263c8fe358f079d5e57d884fb569d2da0a
 F test/whereB.test 0def95db3bdec220a731c7e4bec5930327c1d8c5
 F test/wherelimit.test 5e9fd41e79bb2b2d588ed999d641d9c965619b31
-F test/win32lock.test e12fe40524705cde9a4f5af4668e811807807b84
+F test/win32lock.test cc90e3a73591b6e480b18ce864474908cccfb0d7
 F test/zeroblob.test caaecfb4f908f7bc086ed238668049f96774d688
 F tool/build-shell.sh 12aa4391073a777fcb6dcc490b219a018ae98bac
 F tool/diffdb.c 7524b1b5df217c20cd0431f6789851a4e0cb191b
@@ -954,7 +954,7 @@ F tool/symbols.sh caaf6ccc7300fd43353318b44524853e222557d5
 F tool/tostr.awk 11760e1b94a5d3dcd42378f3cc18544c06cfa576
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
 F tool/warnings.sh 2ebae31e1eb352696f3c2f7706a34c084b28c262
-P b30a5e307fd5485d23e4c4f8ed1c47525a0fe6d3
-R b771650dd0d348534e7a0e458639f43f
+P cd20b4ef6020c0cffe918362afc2b491fb95eb92
+R 2c64effa9318d3db741b9bcbc99c8349
 U mistachkin
-Z b38b345a5f7b867577bd2e55767a9c11
+Z 8b2de65f0513dc9d6a9c2ea9b8d5fabb

diff --git a/manifest.uuid b/manifest.uuid
index 67327d59607c3597c8dbb948aa2a33907588636d..c7fcddf90f5776b53de68409a1e1b80e4c6b392b 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-cd20b4ef6020c0cffe918362afc2b491fb95eb92
\ No newline at end of file
+8a52698e642f40a32d09a6a00b63f25ac38f3fda
\ No newline at end of file

diff --git a/test/win32lock.test b/test/win32lock.test
index 8ed467cfc87dd61b529983705085d55f46dd2b6b..b6f993f062ced341fe0ed3d541499c602fcb2009 100644 (file)
--- a/test/win32lock.test
+++ b/test/win32lock.test
@@ -89,7 +89,7 @@ while {1} {
     do_test win32lock-2.2-$delay1 {
        set ::msg
     } {1 100000 2 50000 3 25000 4 12500}
-    if {$::log!=""} {
+    if {[info exists ::log] && $::log!=""} {
       do_test win32lock-2.2-$delay1-log1 {
         regsub {\d+} $::log # x
         set x