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 /sql/sql_const.h | |
| 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 'sql/sql_const.h')
| -rw-r--r-- | sql/sql_const.h | 4 |
1 files changed, 2 insertions, 2 deletions
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) |