diff --git a/configure.in b/configure.in
index 6d1026c7429..d293e70bb3b 100644
--- a/configure.in
+++ b/configure.in
@@ -678,9 +678,9 @@ fi
 # Add query profiler
 AC_MSG_CHECKING(if SHOW PROFILE should be enabled.)
 AC_ARG_ENABLE(profiling,
-    AS_HELP_STRING([--disable-profiling], [Build a version without query profiling code]),
+    AS_HELP_STRING([--enable-profiling], [Build a version with query profiling code (req. community-features)]),
     [ ENABLED_PROFILING=$enableval ],
-    [ ENABLED_PROFILING=$is_this_community_tree ])
+    [ ENABLED_PROFILING=$ENABLE_COMMUNITY_FEATURES ])
 
 if test "$ENABLED_PROFILING" = "yes"
 then
diff --git a/mysql-test/r/information_schema.result b/mysql-test/r/information_schema.result
index 9409e022a84..ff664f7b80c 100644
--- a/mysql-test/r/information_schema.result
+++ b/mysql-test/r/information_schema.result
@@ -1403,13 +1403,6 @@ TABLE_PRIVILEGES	information_schema.TABLE_PRIVILEGES	1
 TRIGGERS	information_schema.TRIGGERS	1
 USER_PRIVILEGES	information_schema.USER_PRIVILEGES	1
 VIEWS	information_schema.VIEWS	1
-show global status like "Uptime_%";
-Variable_name	Value
-Uptime_since_flush_status	#
-flush status;
-show global status like "Uptime_%";
-Variable_name	Value
-Uptime_since_flush_status	#
 End of 5.0 tests.
 select * from information_schema.engines WHERE ENGINE="MyISAM";
 ENGINE	SUPPORT	COMMENT	TRANSACTIONS	XA	SAVEPOINTS