diff --git a/BitKeeper/etc/collapsed b/BitKeeper/etc/collapsed
index c79a4cf25cc..2b0df86d79c 100644
--- a/BitKeeper/etc/collapsed
+++ b/BitKeeper/etc/collapsed
@@ -43,3 +43,5 @@
 45db468b-DKE8kUTV42eYMYmk8_g9g
 45dd21d1rVPnDfvZTNVHLalcjnbsZw
 45ddaf15_Ld7IAEpUUP3FJjJ-oSEFg
+45ddc763DodLG1BqH_wRBJXMbCSB5A
+45ddc8282KnaNGuijqCTphlXV_eeog
diff --git a/include/config-win.h b/include/config-win.h
index a9977ec955a..8653c0a63f5 100644
--- a/include/config-win.h
+++ b/include/config-win.h
@@ -205,6 +205,9 @@ typedef uint rf_SetTimer;
 /* If LOAD DATA LOCAL INFILE should be enabled by default */
 #define ENABLED_LOCAL_INFILE 1
 
+/* If query profiling should be enabled by default */
+#define ENABLED_PROFILING 1
+
 /* Convert some simple functions to Posix */
 
 #define my_sigset(A,B) signal((A),(B))
diff --git a/sql/sql_prepare.cc b/sql/sql_prepare.cc
index 83ddb9c9212..de08c43658c 100644
--- a/sql/sql_prepare.cc
+++ b/sql/sql_prepare.cc
@@ -2222,7 +2222,9 @@ void mysql_stmt_execute(THD *thd, char *packet_arg, uint packet_length)
   if (!(stmt= find_prepared_statement(thd, stmt_id, "mysql_stmt_execute")))
     DBUG_VOID_RETURN;
 
+#ifdef ENABLED_PROFILING
   thd->profiling.set_query_source(stmt->query, stmt->query_length);
+#endif
   DBUG_PRINT("exec_query", ("%s", stmt->query));
   DBUG_PRINT("info",("stmt: %p", stmt));