diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2015-10-12 00:37:58 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2015-10-12 00:37:58 +0200 |
| commit | dfb74dea300f83880c11600dc726a9cae559f356 (patch) | |
| tree | 76da0d6e23f188bc13520bf80496e9053f227d9a /strings | |
| parent | b785857d00a0fd9c98cb52823357bfad8fb18289 (diff) | |
| parent | e7cb032e560e14865941ecdcb553cd3aba856b68 (diff) | |
| download | mariadb-git-dfb74dea300f83880c11600dc726a9cae559f356.tar.gz | |
Merge branch '10.0' into 10.1
Diffstat (limited to 'strings')
| -rw-r--r-- | strings/conf_to_src.c | 2 | ||||
| -rw-r--r-- | strings/ctype.c | 2 |
2 files changed, 2 insertions, 2 deletions
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 aa40e2b338c..f871a219245 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 |