diff options
| -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 | ||||
| -rw-r--r-- | sql/log_event.h | 2 | ||||
| -rw-r--r-- | sql/sql_admin.h | 2 | ||||
| -rw-r--r-- | sql/sql_const.h | 4 | ||||
| -rw-r--r-- | sql/threadpool_unix.cc | 2 | ||||
| -rw-r--r-- | sql/unireg.h | 12 | ||||
| -rw-r--r-- | storage/archive/archive_test.c | 2 | ||||
| -rw-r--r-- | storage/connect/tabmul.cpp | 2 | ||||
| -rw-r--r-- | storage/federated/ha_federated.h | 2 | ||||
| -rw-r--r-- | storage/maria/ma_blockrec.h | 2 | ||||
| -rw-r--r-- | storage/myisam/myisamdef.h | 2 | ||||
| -rw-r--r-- | strings/conf_to_src.c | 2 | ||||
| -rw-r--r-- | strings/ctype.c | 2 |
16 files changed, 26 insertions, 26 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) diff --git a/sql/log_event.h b/sql/log_event.h index 6a3e6f174bb..1349ec6187a 100644 --- a/sql/log_event.h +++ b/sql/log_event.h @@ -295,7 +295,7 @@ struct sql_ex_info to the slave. It is used to increase the thd(max_allowed) for both the DUMP thread on the master and the SQL/IO thread on the slave. */ -#define MAX_MAX_ALLOWED_PACKET 1024*1024*1024 +#define MAX_MAX_ALLOWED_PACKET (1024*1024*1024) /* Event header offsets; diff --git a/sql/sql_admin.h b/sql/sql_admin.h index 77fc41e2ec4..96594fad0cb 100644 --- a/sql/sql_admin.h +++ b/sql/sql_admin.h @@ -17,7 +17,7 @@ #define SQL_TABLE_MAINTENANCE_H /* Must be able to hold ALTER TABLE t PARTITION BY ... KEY ALGORITHM = 1 ... */ -#define SQL_ADMIN_MSG_TEXT_SIZE 128 * 1024 +#define SQL_ADMIN_MSG_TEXT_SIZE (128 * 1024) bool mysql_assign_to_keycache(THD* thd, TABLE_LIST* table_list, LEX_STRING *key_cache_name); diff --git a/sql/sql_const.h b/sql/sql_const.h index 2cbc616559d..9110902cde7 100644 --- a/sql/sql_const.h +++ b/sql/sql_const.h @@ -142,7 +142,7 @@ */ #define STACK_MIN_SIZE 16000 // Abort if less stack during eval. -#define STACK_MIN_SIZE_FOR_OPEN 1024*80 +#define STACK_MIN_SIZE_FOR_OPEN (1024*80) #define STACK_BUFF_ALLOC 352 ///< For stack overrun checks #ifndef MYSQLD_NET_RETRY_COUNT #define MYSQLD_NET_RETRY_COUNT 10 ///< Abort read after this many int. @@ -238,7 +238,7 @@ #define DEFAULT_CONCURRENCY 10 #define DELAYED_LIMIT 100 /**< pause after xxx inserts */ #define DELAYED_QUEUE_SIZE 1000 -#define DELAYED_WAIT_TIMEOUT 5*60 /**< Wait for delayed insert */ +#define DELAYED_WAIT_TIMEOUT (5*60) /**< Wait for delayed insert */ #define MAX_CONNECT_ERRORS 100 ///< errors before disabling host #define LONG_TIMEOUT ((ulong) 3600L*24L*365L) diff --git a/sql/threadpool_unix.cc b/sql/threadpool_unix.cc index 68c032fb67b..e720e43498a 100644 --- a/sql/threadpool_unix.cc +++ b/sql/threadpool_unix.cc @@ -1634,7 +1634,7 @@ int tp_get_idle_thread_count() Delay in microseconds, after which "pool blocked" message is printed. (30 sec == 30 Mio usec) */ -#define BLOCK_MSG_DELAY 30*1000000 +#define BLOCK_MSG_DELAY (30*1000000) #define MAX_THREADS_REACHED_MSG \ "Threadpool could not create additional thread to handle queries, because the \ diff --git a/sql/unireg.h b/sql/unireg.h index 2d51aa39fd4..b13dd494c74 100644 --- a/sql/unireg.h +++ b/sql/unireg.h @@ -110,36 +110,36 @@ The flag means that we need to process tables only to get necessary data. Views are not processed. */ -#define OPEN_TABLE_ONLY OPEN_FRM_FILE_ONLY*2 +#define OPEN_TABLE_ONLY (OPEN_FRM_FILE_ONLY*2) /** This flag is used in function get_all_tables() which fills I_S tables with data which are retrieved from frm files and storage engine The flag means that we need to process views only to get necessary data. Tables are not processed. */ -#define OPEN_VIEW_ONLY OPEN_TABLE_ONLY*2 +#define OPEN_VIEW_ONLY (OPEN_TABLE_ONLY*2) /** This flag is used in function get_all_tables() which fills I_S tables with data which are retrieved from frm files and storage engine. The flag means that we need to open a view using open_normal_and_derived_tables() function. */ -#define OPEN_VIEW_FULL OPEN_VIEW_ONLY*2 +#define OPEN_VIEW_FULL (OPEN_VIEW_ONLY*2) /** This flag is used in function get_all_tables() which fills I_S tables with data which are retrieved from frm files and storage engine. The flag means that I_S table uses optimization algorithm. */ -#define OPTIMIZE_I_S_TABLE OPEN_VIEW_FULL*2 +#define OPTIMIZE_I_S_TABLE (OPEN_VIEW_FULL*2) /** This flag is used to instruct tdc_open_view() to check metadata version. */ -#define CHECK_METADATA_VERSION OPEN_TRIGGER_ONLY*2 +#define CHECK_METADATA_VERSION (OPEN_TRIGGER_ONLY*2) /* The flag means that we need to process trigger files only. */ -#define OPEN_TRIGGER_ONLY OPTIMIZE_I_S_TABLE*2 +#define OPEN_TRIGGER_ONLY (OPTIMIZE_I_S_TABLE*2) #define SC_INFO_LENGTH 4 /* Form format constant */ #define TE_INFO_LENGTH 3 diff --git a/storage/archive/archive_test.c b/storage/archive/archive_test.c index d01c1e0b22e..bb052b8409c 100644 --- a/storage/archive/archive_test.c +++ b/storage/archive/archive_test.c @@ -33,7 +33,7 @@ #define ARCHIVE_ROW_HEADER_SIZE 4 -#define BUFFER_LEN 1024 + ARCHIVE_ROW_HEADER_SIZE +#define BUFFER_LEN (1024 + ARCHIVE_ROW_HEADER_SIZE) char test_string[BUFFER_LEN]; diff --git a/storage/connect/tabmul.cpp b/storage/connect/tabmul.cpp index 3008ca1b8ca..ea287558b44 100644 --- a/storage/connect/tabmul.cpp +++ b/storage/connect/tabmul.cpp @@ -123,7 +123,7 @@ PTDB TDBMUL::Duplicate(PGLOBAL g) bool TDBMUL::InitFileNames(PGLOBAL g) { #define PFNZ 4096 -#define FNSZ _MAX_DRIVE+_MAX_DIR+_MAX_FNAME+_MAX_EXT +#define FNSZ (_MAX_DRIVE+_MAX_DIR+_MAX_FNAME+_MAX_EXT) char *pfn[PFNZ]; char *filename; int rc, n = 0; diff --git a/storage/federated/ha_federated.h b/storage/federated/ha_federated.h index cfda0eadf3e..a23375cbe58 100644 --- a/storage/federated/ha_federated.h +++ b/storage/federated/ha_federated.h @@ -34,7 +34,7 @@ */ #define HA_FEDERATED_ERROR_WITH_REMOTE_SYSTEM 10000 -#define FEDERATED_QUERY_BUFFER_SIZE STRING_BUFFER_USUAL_SIZE * 5 +#define FEDERATED_QUERY_BUFFER_SIZE (STRING_BUFFER_USUAL_SIZE * 5) #define FEDERATED_RECORDS_IN_RANGE 2 #define FEDERATED_MAX_KEY_LENGTH 3500 // Same as innodb diff --git a/storage/maria/ma_blockrec.h b/storage/maria/ma_blockrec.h index 40ca2591236..1caf09ef1f5 100644 --- a/storage/maria/ma_blockrec.h +++ b/storage/maria/ma_blockrec.h @@ -44,7 +44,7 @@ /* Number of extents reserved MARIA_BITMAP_BLOCKS to store head part */ #define ELEMENTS_RESERVED_FOR_MAIN_PART 4 /* This is just used to prealloc a dynamic array */ -#define AVERAGE_BLOB_SIZE 1024L*1024L +#define AVERAGE_BLOB_SIZE (1024L*1024L) /* Number of pages to store continuous blob parts */ #define BLOB_SEGMENT_MIN_SIZE 128 diff --git a/storage/myisam/myisamdef.h b/storage/myisam/myisamdef.h index 8ca052af4ac..07c4a5b473a 100644 --- a/storage/myisam/myisamdef.h +++ b/storage/myisam/myisamdef.h @@ -307,7 +307,7 @@ struct st_myisam_info int rtree_recursion_depth; }; -#define USE_WHOLE_KEY HA_MAX_KEY_BUFF*2 /* Use whole key in _mi_search() */ +#define USE_WHOLE_KEY (HA_MAX_KEY_BUFF*2) /* Use whole key in _mi_search() */ #define F_EXTRA_LCK -1 /* bits in opt_flag */ #define MEMMAP_USED 32 diff --git a/strings/conf_to_src.c b/strings/conf_to_src.c index 8d25ac8e7ed..28d2fd1515e 100644 --- a/strings/conf_to_src.c +++ b/strings/conf_to_src.c @@ -23,7 +23,7 @@ #define ROW_LEN 16 #define ROW16_LEN 8 -#define MAX_BUF 64*1024 +#define MAX_BUF (64*1024) static struct charset_info_st all_charsets[512]; diff --git a/strings/ctype.c b/strings/ctype.c index 048fbe3d368..d8a1dd7502b 100644 --- a/strings/ctype.c +++ b/strings/ctype.c @@ -264,7 +264,7 @@ static const struct my_cs_file_section_st } #define MY_CS_CSDESCR_SIZE 64 -#define MY_CS_TAILORING_SIZE 32*1024 +#define MY_CS_TAILORING_SIZE (32*1024) #define MY_CS_UCA_VERSION_SIZE 64 #define MY_CS_CONTEXT_SIZE 64 |