diff options
| author | Igor Babaev <igor@askmonty.org> | 2010-12-24 08:17:43 -0800 |
|---|---|---|
| committer | Igor Babaev <igor@askmonty.org> | 2010-12-24 08:17:43 -0800 |
| commit | 7d68e1ead7be84fd6476854c8b4ff02ef16ea7d4 (patch) | |
| tree | 4cfe18466b680dfcb50da9bc9760f3e13606df4f /sql/unireg.h | |
| parent | 6c958d6e80f681c207f4298b754c8b18170d3224 (diff) | |
| parent | 6f2db629a0b251e141bc29f2f1c3e3ac99a4eaa5 (diff) | |
| download | mariadb-git-7d68e1ead7be84fd6476854c8b4ff02ef16ea7d4.tar.gz | |
Merge: mwl#24+mwl#21 5.1->5.2
Diffstat (limited to 'sql/unireg.h')
| -rw-r--r-- | sql/unireg.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/unireg.h b/sql/unireg.h index 57a9038d5f7..ccdbb650485 100644 --- a/sql/unireg.h +++ b/sql/unireg.h @@ -89,7 +89,7 @@ #define MAX_SELECT_NESTING (sizeof(nesting_map)*8-1) #define MAX_SORT_MEMORY (2048*1024-MALLOC_OVERHEAD) -#define MIN_SORT_MEMORY (32*1024-MALLOC_OVERHEAD) +#define MIN_SORT_MEMORY (1024-MALLOC_OVERHEAD) /* Memory allocated when parsing a statement / saving a statement */ #define MEM_ROOT_BLOCK_SIZE 8192 |