diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2019-09-18 14:18:08 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2019-09-28 19:21:14 +0200 |
| commit | de9ef03ae6a6cf573062c89d22ca446154f435f5 (patch) | |
| tree | 3c70dda4f749fc760d9ecf3b4d8587b4774d0b5e | |
| parent | fab84ec97991b79cf41a7acb8009dfe263f6143a (diff) | |
| download | mariadb-git-de9ef03ae6a6cf573062c89d22ca446154f435f5.tar.gz | |
fix max_rows calculations for internal on-disk temp tables
| -rw-r--r-- | sql/opt_subselect.cc | 2 | ||||
| -rw-r--r-- | sql/sql_select.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/sql/opt_subselect.cc b/sql/opt_subselect.cc index 87458357865..80f3b242e59 100644 --- a/sql/opt_subselect.cc +++ b/sql/opt_subselect.cc @@ -4607,7 +4607,7 @@ SJ_TMP_TABLE::create_sj_weedout_tmp_table(THD *thd) share->max_rows= (ha_rows) (((share->db_type() == heap_hton) ? MY_MIN(thd->variables.tmp_memory_table_size, thd->variables.max_heap_table_size) : - thd->variables.tmp_memory_table_size) / + thd->variables.tmp_disk_table_size) / share->reclength); set_if_bigger(share->max_rows,1); // For dummy start options diff --git a/sql/sql_select.cc b/sql/sql_select.cc index 36d9eda3383..eb1d039683d 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -18543,7 +18543,7 @@ bool Create_tmp_table::finalize(THD *thd, share->max_rows= (ha_rows) (((share->db_type() == heap_hton) ? MY_MIN(thd->variables.tmp_memory_table_size, thd->variables.max_heap_table_size) : - thd->variables.tmp_memory_table_size) / + thd->variables.tmp_disk_table_size) / share->reclength); set_if_bigger(share->max_rows,1); // For dummy start options /* |