summaryrefslogtreecommitdiff
path: root/sql/sql_profile.h
diff options
context:
space:
mode:
authorunknown <cmiller@zippy.cornsilk.net>2007-12-14 08:57:37 -0500
committerunknown <cmiller@zippy.cornsilk.net>2007-12-14 08:57:37 -0500
commitf8ccbcc4315c843636cfdc6330c6b000cb5b05ad (patch)
tree22ef323f5858f2fdc5a21eb099821f8e1e20adb1 /sql/sql_profile.h
parent7eb9aac77e69e0bce9234958b50dde38140007a8 (diff)
downloadmariadb-git-f8ccbcc4315c843636cfdc6330c6b000cb5b05ad.tar.gz
Correct complaints of reviewers and clean up test.
mysql-test/r/profiling.result: Remove unnecessary verbosity. Remove section of test that is impossible to test with PS protocol. mysql-test/t/profiling.test: Remove unnecessary verbosity. Remove section of test that is impossible to test with PS protocol. sql/sql_profile.h: Make bit flags unsigned ints.
Diffstat (limited to 'sql/sql_profile.h')
-rw-r--r--sql/sql_profile.h20
1 files changed, 10 insertions, 10 deletions
diff --git a/sql/sql_profile.h b/sql/sql_profile.h
index 2483cb3cb6a..b5537487d26 100644
--- a/sql/sql_profile.h
+++ b/sql/sql_profile.h
@@ -42,16 +42,16 @@ int fill_query_profile_statistics_info(THD *thd, TABLE_LIST *tables, Item *cond)
int make_profile_table_for_show(THD *thd, ST_SCHEMA_TABLE *schema_table);
-#define PROFILE_NONE 0
-#define PROFILE_CPU (1<<0)
-#define PROFILE_MEMORY (1<<1)
-#define PROFILE_BLOCK_IO (1<<2)
-#define PROFILE_CONTEXT (1<<3)
-#define PROFILE_PAGE_FAULTS (1<<4)
-#define PROFILE_IPC (1<<5)
-#define PROFILE_SWAPS (1<<6)
-#define PROFILE_SOURCE (1<<16)
-#define PROFILE_ALL (~0)
+#define PROFILE_NONE (uint)0
+#define PROFILE_CPU (uint)(1<<0)
+#define PROFILE_MEMORY (uint)(1<<1)
+#define PROFILE_BLOCK_IO (uint)(1<<2)
+#define PROFILE_CONTEXT (uint)(1<<3)
+#define PROFILE_PAGE_FAULTS (uint)(1<<4)
+#define PROFILE_IPC (uint)(1<<5)
+#define PROFILE_SWAPS (uint)(1<<6)
+#define PROFILE_SOURCE (uint)(1<<16)
+#define PROFILE_ALL (uint)(~0)
#if defined(ENABLED_PROFILING) && defined(COMMUNITY_SERVER)