diff options
| author | Pavel Ivanov <pivanof@google.com> | 2015-07-16 15:59:55 -0700 |
|---|---|---|
| committer | Pavel Ivanov <pivanof@google.com> | 2015-07-16 16:03:06 -0700 |
| commit | 203f4d41930a140d469aeca9840a7b226afeaaf6 (patch) | |
| tree | c7985f98f5fbc6e2d62af970b29b496d70d08aef /sql/log_slow.h | |
| parent | 3bbffc211945f99f9bba806e7031bea6b73a1993 (diff) | |
| download | mariadb-git-203f4d41930a140d469aeca9840a7b226afeaaf6.tar.gz | |
Add parenthesis in macro definitions to prevent order of operation problems.
When macro is expanded in an expression like ~QPLAN_QC_NO (e.g. in the
Query_cache::send_result_to_client() function in sql/sql_cache.cc) then without
the parenthesis the expression will be evaluated to a wrong value.
Diffstat (limited to 'sql/log_slow.h')
| -rw-r--r-- | sql/log_slow.h | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/sql/log_slow.h b/sql/log_slow.h index 2ae07da97c3..3ae2060cc27 100644 --- a/sql/log_slow.h +++ b/sql/log_slow.h @@ -16,23 +16,23 @@ /* Defining what to log to slow log */ #define LOG_SLOW_VERBOSITY_INIT 0 -#define LOG_SLOW_VERBOSITY_INNODB 1 << 0 -#define LOG_SLOW_VERBOSITY_QUERY_PLAN 1 << 1 -#define LOG_SLOW_VERBOSITY_EXPLAIN 1 << 2 +#define LOG_SLOW_VERBOSITY_INNODB (1 << 0) +#define LOG_SLOW_VERBOSITY_QUERY_PLAN (1 << 1) +#define LOG_SLOW_VERBOSITY_EXPLAIN (1 << 2) #define QPLAN_INIT QPLAN_QC_NO -#define QPLAN_ADMIN 1 << 0 -#define QPLAN_FILESORT 1 << 1 -#define QPLAN_FILESORT_DISK 1 << 2 -#define QPLAN_FULL_JOIN 1 << 3 -#define QPLAN_FULL_SCAN 1 << 4 -#define QPLAN_QC 1 << 5 -#define QPLAN_QC_NO 1 << 6 -#define QPLAN_TMP_DISK 1 << 7 -#define QPLAN_TMP_TABLE 1 << 8 -#define QPLAN_FILESORT_PRIORITY_QUEUE 1 << 9 +#define QPLAN_ADMIN (1 << 0) +#define QPLAN_FILESORT (1 << 1) +#define QPLAN_FILESORT_DISK (1 << 2) +#define QPLAN_FULL_JOIN (1 << 3) +#define QPLAN_FULL_SCAN (1 << 4) +#define QPLAN_QC (1 << 5) +#define QPLAN_QC_NO (1 << 6) +#define QPLAN_TMP_DISK (1 << 7) +#define QPLAN_TMP_TABLE (1 << 8) +#define QPLAN_FILESORT_PRIORITY_QUEUE (1 << 9) /* ... */ -#define QPLAN_MAX ((ulong) 1) << 31 /* reserved as placeholder */ +#define QPLAN_MAX (((ulong) 1) << 31) /* reserved as placeholder */ |