diff --git a/dbcon/execplan/execplan.vpj b/dbcon/execplan/execplan.vpj
index 956fe3dac..6f964bc80 100644
--- a/dbcon/execplan/execplan.vpj
+++ b/dbcon/execplan/execplan.vpj
@@ -1,326 +1,302 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ Version="10.0"
+ VendorName="SlickEdit"
+ TemplateName="GNU C/C++"
+ WorkingDir=".">
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/dbcon/execplan/windowfunctioncolumn.h b/dbcon/execplan/windowfunctioncolumn.h
index d8b9fec75..477660b2f 100644
--- a/dbcon/execplan/windowfunctioncolumn.h
+++ b/dbcon/execplan/windowfunctioncolumn.h
@@ -41,7 +41,7 @@ class ByteStream;
*/
namespace execplan {
-// This enum is made consistant with mysql item_func_window
+// This enum is made consistant with mysql Item_window_func
enum WF_FRAME
{
WF_PRECEDING = 0,
diff --git a/dbcon/mysql/ha_calpont_execplan.cpp b/dbcon/mysql/ha_calpont_execplan.cpp
index 85fe0b45f..93499aa4d 100755
--- a/dbcon/mysql/ha_calpont_execplan.cpp
+++ b/dbcon/mysql/ha_calpont_execplan.cpp
@@ -21,7 +21,7 @@
*/
/** @file */
-//#define DEBUG_WALK_COND
+#define DEBUG_WALK_COND
#include
#include
#include
@@ -38,7 +38,6 @@
#include
#include
#include
-//#define NDEBUG
#include
#include
#include