diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2015-09-01 11:47:06 +0200 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2015-09-06 22:26:33 +0200 |
| commit | 0ce0b88080fd39f6841206b64d8723af9779e849 (patch) | |
| tree | 3b0f4ab28e0f7f64d198a7c8179166ccda7bb102 /include | |
| parent | 9abf426ee7f1ca2bab2683387137d3da0f18bc0e (diff) | |
| download | mariadb-git-0ce0b88080fd39f6841206b64d8723af9779e849.tar.gz | |
MDEV-8450: PATCH] Wrong macro expansion in Query_cache::send_result_to_client()
Expression in macro protected by ()
Diffstat (limited to 'include')
| -rw-r--r-- | include/maria.h | 2 | ||||
| -rw-r--r-- | include/my_alarm.h | 2 | ||||
| -rw-r--r-- | include/my_base.h | 8 | ||||
| -rw-r--r-- | include/mysql.h | 4 |
4 files changed, 8 insertions, 8 deletions
diff --git a/include/maria.h b/include/maria.h index 16a9beab62a..cdaeadef4de 100644 --- a/include/maria.h +++ b/include/maria.h @@ -43,7 +43,7 @@ extern "C" { #define MARIA_NAME_IEXT ".MAI" #define MARIA_NAME_DEXT ".MAD" /* Max extra space to use when sorting keys */ -#define MARIA_MAX_TEMP_LENGTH 2*1024L*1024L*1024L +#define MARIA_MAX_TEMP_LENGTH (2*1024L*1024L*1024L) /* Possible values for maria_block_size (must be power of 2) */ #define MARIA_KEY_BLOCK_LENGTH 8192 /* default key block length */ #define MARIA_MIN_KEY_BLOCK_LENGTH 1024 /* Min key block length */ diff --git a/include/my_alarm.h b/include/my_alarm.h index c3707cba395..73bb6ab76cc 100644 --- a/include/my_alarm.h +++ b/include/my_alarm.h @@ -50,7 +50,7 @@ extern ulong my_time_to_wait_for_lock; #define ALARM_INIT #define ALARM_END #define ALARM_TEST (alarm_pos++ >= alarm_end_pos) -#define ALARM_REINIT alarm_end_pos+=MY_HOW_OFTEN_TO_WRITE +#define ALARM_REINIT (alarm_end_pos+=MY_HOW_OFTEN_TO_WRITE) #endif /* HAVE_ALARM */ #ifdef __cplusplus diff --git a/include/my_base.h b/include/my_base.h index cdf8e189031..5c3dd8db9d9 100644 --- a/include/my_base.h +++ b/include/my_base.h @@ -536,13 +536,13 @@ typedef ulong key_part_map; #define SEARCH_NULL_ARE_EQUAL 32768 /* NULL in keys are equal */ #define SEARCH_NULL_ARE_NOT_EQUAL 65536 /* NULL in keys are not equal */ /* Use this when inserting a key in position order */ -#define SEARCH_INSERT SEARCH_NULL_ARE_NOT_EQUAL*2 +#define SEARCH_INSERT (SEARCH_NULL_ARE_NOT_EQUAL*2) /* Only part of the key is specified while reading */ -#define SEARCH_PART_KEY SEARCH_INSERT*2 +#define SEARCH_PART_KEY (SEARCH_INSERT*2) /* Used when user key (key 2) contains transaction id's */ -#define SEARCH_USER_KEY_HAS_TRANSID SEARCH_PART_KEY*2 +#define SEARCH_USER_KEY_HAS_TRANSID (SEARCH_PART_KEY*2) /* Used when page key (key 1) contains transaction id's */ -#define SEARCH_PAGE_KEY_HAS_TRANSID SEARCH_USER_KEY_HAS_TRANSID*2 +#define SEARCH_PAGE_KEY_HAS_TRANSID (SEARCH_USER_KEY_HAS_TRANSID*2) /* bits in opt_flag */ #define QUICK_USED 1 diff --git a/include/mysql.h b/include/mysql.h index d9d9739dd1f..f088ad668a1 100644 --- a/include/mysql.h +++ b/include/mysql.h @@ -79,8 +79,8 @@ extern unsigned int mariadb_deinitialize_ssl; extern unsigned int mysql_port; extern char *mysql_unix_port; -#define CLIENT_NET_READ_TIMEOUT 365*24*3600 /* Timeout on read */ -#define CLIENT_NET_WRITE_TIMEOUT 365*24*3600 /* Timeout on write */ +#define CLIENT_NET_READ_TIMEOUT (365*24*3600) /* Timeout on read */ +#define CLIENT_NET_WRITE_TIMEOUT (365*24*3600) /* Timeout on write */ #define IS_PRI_KEY(n) ((n) & PRI_KEY_FLAG) #define IS_NOT_NULL(n) ((n) & NOT_NULL_FLAG) |