diff options
| author | Davi Arnaut <Davi.Arnaut@Sun.COM> | 2010-06-28 16:20:28 -0300 |
|---|---|---|
| committer | Davi Arnaut <Davi.Arnaut@Sun.COM> | 2010-06-28 16:20:28 -0300 |
| commit | 715bac92ba447df802d2f144c168cbeb6f2950be (patch) | |
| tree | 455f3dad8a985e639fac05191f077054a75b0cab /include/myisam.h | |
| parent | 77854696c4d0cab8ff56ea68e82879e87f30083c (diff) | |
| download | mariadb-git-715bac92ba447df802d2f144c168cbeb6f2950be.tar.gz | |
Bug#54457: Test suite broken for 32-bit build
The default value of the myisam_max_extra_sort_file_size could be
higher than the maximum accepted value, leading to warnings upon
the server start.
The solution is to simply set the value to the maximum value in a
32-bit built (2147483647, one less than the current). This should
be harmless as the option is currently unused in 5.1.
include/myisam.h:
Remove now-unused macro.
sql/mysqld.cc:
Set max value to INT_MAX32.
Diffstat (limited to 'include/myisam.h')
| -rw-r--r-- | include/myisam.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/myisam.h b/include/myisam.h index 5334fd6afc4..e502daa2f17 100644 --- a/include/myisam.h +++ b/include/myisam.h @@ -55,8 +55,6 @@ extern "C" { #define MI_MAX_MSG_BUF 1024 /* used in CHECK TABLE, REPAIR TABLE */ #define MI_NAME_IEXT ".MYI" #define MI_NAME_DEXT ".MYD" -/* Max extra space to use when sorting keys */ -#define MI_MAX_TEMP_LENGTH 2*1024L*1024L*1024L /* Possible values for myisam_block_size (must be power of 2) */ #define MI_KEY_BLOCK_LENGTH 1024 /* default key block length */ |