diff options
| author | Monty <monty@mariadb.org> | 2017-06-30 17:56:58 +0300 |
|---|---|---|
| committer | Monty <monty@mariadb.org> | 2017-06-30 22:31:37 +0300 |
| commit | dd8474b1dc556d0ea9491d1908a2d1237818e8c1 (patch) | |
| tree | 9ab8535fbac53bf3a644482a41c59eaca1371754 /sql/item_sum.cc | |
| parent | 9f484b63f1b61e6ade1481cfb8465f8fe208386d (diff) | |
| download | mariadb-git-dd8474b1dc556d0ea9491d1908a2d1237818e8c1.tar.gz | |
Added tmp_disk_table_size to limit size of Aria temp tables in tmpdir
- Added variable tmp_disk_table_size
- Added variable tmp_memory_table_size as an alias for tmp_table_size
- Changed internal variable tmp_table_size to tmp_memory_table_size
- create_info.data_file_length is now set with tmp_disk_table_size
- Fixed that Aria doesn't reset max_data_file_length for internal tables
- Added status flag if table is full so that we can detect this on next insert.
This ensures that the table is always 'correct', but we get the error one
row after the row that grow the table too big.
- Removed some mutex lock for internal temporary tables
Diffstat (limited to 'sql/item_sum.cc')
| -rw-r--r-- | sql/item_sum.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/item_sum.cc b/sql/item_sum.cc index cb2d3e839b8..35e8dea46a7 100644 --- a/sql/item_sum.cc +++ b/sql/item_sum.cc @@ -38,8 +38,8 @@ ulonglong Item_sum::ram_limitation(THD *thd) { - return MY_MIN(thd->variables.tmp_table_size, - thd->variables.max_heap_table_size); + return MY_MIN(thd->variables.tmp_memory_table_size, + thd->variables.max_heap_table_size); } |