diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2010-09-16 09:58:57 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2010-09-16 09:58:57 +0200 |
| commit | b170b126b02c2989e68694d6781fb48d4f316363 (patch) | |
| tree | bfc039f3ee09098fe5df5082ba6aaea56ebac313 /sql/sql_class.h | |
| parent | 41e66d57d5898ea2fa38dfb3a6b47de876efd3c9 (diff) | |
| parent | b4b6494643fa6b0eb96e6af230ab7c47e6ba1be3 (diff) | |
| download | mariadb-git-b170b126b02c2989e68694d6781fb48d4f316363.tar.gz | |
merge with 5.1
Diffstat (limited to 'sql/sql_class.h')
| -rw-r--r-- | sql/sql_class.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_class.h b/sql/sql_class.h index a430999919d..43b464ec218 100644 --- a/sql/sql_class.h +++ b/sql/sql_class.h @@ -3040,7 +3040,7 @@ public: ulonglong max_in_memory_size) { register ulonglong max_elems_in_tree= - (1 + max_in_memory_size / ALIGN_SIZE(sizeof(TREE_ELEMENT)+key_size)); + max_in_memory_size / ALIGN_SIZE(sizeof(TREE_ELEMENT)+key_size); return (int) (sizeof(uint)*(1 + nkeys/max_elems_in_tree)); } |