1
0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00

fix max_rows calculations for internal on-disk temp tables

This commit is contained in:
Sergei Golubchik
2019-09-18 14:18:08 +02:00
parent fab84ec979
commit de9ef03ae6
2 changed files with 2 additions and 2 deletions

View File

@ -4607,7 +4607,7 @@ SJ_TMP_TABLE::create_sj_weedout_tmp_table(THD *thd)
share->max_rows= (ha_rows) (((share->db_type() == heap_hton) ? share->max_rows= (ha_rows) (((share->db_type() == heap_hton) ?
MY_MIN(thd->variables.tmp_memory_table_size, MY_MIN(thd->variables.tmp_memory_table_size,
thd->variables.max_heap_table_size) : thd->variables.max_heap_table_size) :
thd->variables.tmp_memory_table_size) / thd->variables.tmp_disk_table_size) /
share->reclength); share->reclength);
set_if_bigger(share->max_rows,1); // For dummy start options set_if_bigger(share->max_rows,1); // For dummy start options

View File

@ -18543,7 +18543,7 @@ bool Create_tmp_table::finalize(THD *thd,
share->max_rows= (ha_rows) (((share->db_type() == heap_hton) ? share->max_rows= (ha_rows) (((share->db_type() == heap_hton) ?
MY_MIN(thd->variables.tmp_memory_table_size, MY_MIN(thd->variables.tmp_memory_table_size,
thd->variables.max_heap_table_size) : thd->variables.max_heap_table_size) :
thd->variables.tmp_memory_table_size) / thd->variables.tmp_disk_table_size) /
share->reclength); share->reclength);
set_if_bigger(share->max_rows,1); // For dummy start options set_if_bigger(share->max_rows,1); // For dummy start options
/* /*