diff --git a/Makefile.msc b/Makefile.msc
index 6c3e2139d0..52a90ea9b6 100644
--- a/Makefile.msc
+++ b/Makefile.msc
@@ -10,7 +10,19 @@ TOP = .
 # Set this non-0 to create and use the SQLite amalgamation file.
 #
 USE_AMALGAMATION = 1
-DEBUG=0
+
+# Set this to one of the following values to enable various debugging
+# features.  Each level includes the debugging options from the previous
+# levels.  Currently, the recognized values for DEBUG are:
+#
+# 0 == NDEBUG: Disables assert() and other runtime diagnostics.
+# 1 == Disables NDEBUG and all optimizations and then enables PDBs.
+# 2 == SQLITE_DEBUG: Enables various diagnostics messages and code.
+# 3 == SQLITE_WIN32_MALLOC_VALIDATE: Validate the Win32 native heap per call.
+# 4 == SQLITE_DEBUG_OS_TRACE: Enables output from the OSTRACE() macros.
+# 5 == SQLITE_ENABLE_IOTRACE: Enables output from the IOTRACE() macros.
+#
+DEBUG = 0
 
 # Version numbers and release number for the SQLite being compiled.
 #
@@ -151,9 +163,9 @@ TCC = $(TCC) $(OPT_FEATURE_FLAGS)
 # ie.  make "OPTS=-DSQLITE_ENABLE_FOO=1 -DSQLITE_OMIT_FOO=1".
 TCC = $(TCC) $(OPTS)
 
-# Add debug information if enabled.
-!IF $(DEBUG)!=0
-TCC = $(TCC) -Zi -D_DEBUG
+# If debugging is enabled, disable all optimizations and enable PDBs.
+!IF $(DEBUG)>0
+TCC = $(TCC) -Od -Zi -D_DEBUG
 !ENDIF
 
 # libtool compile/link
@@ -170,7 +182,8 @@ LTLINKOPTS = /MACHINE:$(PLATFORM)
 LTLIBOPTS = /MACHINE:$(PLATFORM)
 !ENDIF
 
-!IF $(DEBUG)!=0
+# If debugging is enabled, enable PDBs.
+!IF $(DEBUG)>0
 LTLINKOPTS = $(LTLINKOPTS) /DEBUG
 !ENDIF
 
diff --git a/manifest b/manifest
index 668a0483a9..7e02d878df 100644
--- a/manifest
+++ b/manifest
@@ -1,9 +1,9 @@
-C In\sthe\sMSVC\smakefile,\ssupport\sseveral\slevels\sof\sdebugging,\seach\sone\sbuilding\son\sthe\sprevious.\s\sAlso,\sadd\scomment\sabout\sthe\sSQLITE_WIN32_MALLOC_VALIDATE\smacro.
-D 2011-08-25T02:02:25.221
+C Add\scomments\sfor\sthe\svarious\sdebug\slevels.\s\sWhen\sdebugging,\sdisable\soptimizations.\s\sPrevent\sthe\swin32lock\stests\sfrom\sspinning\sforever.
+D 2011-08-25T04:09:12.308
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 8c930e7b493d59099ea1304bd0f2aed152eb3315
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
-F Makefile.msc 2bd2c2956d9b5662f2f239f3f4785ab940c9d095
+F Makefile.msc bc9394ac5e8d87e3de2c1573b099bb05b92dc3b0
 F Makefile.vxworks c85ec1d8597fe2f7bc225af12ac1666e21379151
 F README cd04a36fbc7ea56932a4052d7d0b7f09f27c33d6
 F VERSION f724de7326e87b7f3b0a55f16ef4b4d993680d54
@@ -918,7 +918,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 d60b39c53c68617524429be27bf239f0b11673f2
+F test/win32lock.test 00151c83c77e9413a775e9a285d5ff4d71fede06
 F test/zeroblob.test caaecfb4f908f7bc086ed238668049f96774d688
 F tool/build-shell.sh 12aa4391073a777fcb6dcc490b219a018ae98bac
 F tool/diffdb.c 7524b1b5df217c20cd0431f6789851a4e0cb191b
@@ -961,7 +961,7 @@ F tool/symbols.sh caaf6ccc7300fd43353318b44524853e222557d5
 F tool/tostr.awk 11760e1b94a5d3dcd42378f3cc18544c06cfa576
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
 F tool/warnings.sh b7fdb2cc525f5ef4fa43c80e771636dd3690f9d2
-P d4f6437f8de82482dfaa4c084f4221e89e21eb00
-R da2e33245e2364528467756cf50f41d5
+P 4257e9b7ca78feb03df08fde56da947ae64c5c6f
+R 0448fba2024f79c072babb8ddd4d7080
 U mistachkin
-Z b479c51d4c7cb9ebde1314847b959959
+Z d666bad4d643507c471d1b757fa63134
diff --git a/manifest.uuid b/manifest.uuid
index 96d5bdbabc..e4a72c339e 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-4257e9b7ca78feb03df08fde56da947ae64c5c6f
\ No newline at end of file
+401859236b0d97bde82b11f32efce6eb9d490941
\ No newline at end of file
diff --git a/test/win32lock.test b/test/win32lock.test
index 7fed2e0c08..2ef6f6cbc5 100644
--- a/test/win32lock.test
+++ b/test/win32lock.test
@@ -69,6 +69,10 @@ while {1} {
   }
   if {[llength $win32_lock_ok] && [llength $win32_lock_error]} break
   incr delay1 25
+  if {$delay1 > 12500} {
+    puts "Timed out waiting for \"ok\" and \"error\" results."
+    break
+  }
   sqlite3_sleep 10
 }
 
@@ -113,6 +117,10 @@ while {1} {
   }
   if {[llength $win32_lock_ok] && [llength $win32_lock_error]} break
   incr delay1 1
+  if {$delay1 > 500} {
+    puts "Timed out waiting for \"ok\" and \"error\" results."
+    break
+  }
   sqlite3_sleep 10
 }