diff options
| author | Varun Gupta <varun.gupta@mariadb.com> | 2020-02-09 20:43:28 +0530 |
|---|---|---|
| committer | Varun Gupta <varun.gupta@mariadb.com> | 2020-02-09 20:43:28 +0530 |
| commit | e9b6afea25b452989e2f1d307e6320b2676f8821 (patch) | |
| tree | 32e568ecb6cb4caff944ed9229b8288fe4f97b47 | |
| parent | 70e9fe5b9ab0b60588b51bd23ca9c2e02625db77 (diff) | |
| download | mariadb-git-e9b6afea25b452989e2f1d307e6320b2676f8821.tar.gz | |
Minor fixes after rebasing on 10.5
| -rw-r--r-- | sql/sql_select.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sql/sql_select.cc b/sql/sql_select.cc index c9905d10cbd..dd30b78069c 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -8133,7 +8133,7 @@ best_access_path(JOIN *join, if (!best_key && idx == join->const_tables && s->table == join->sort_by_table && - join->unit->select_limit_cnt >= records) + join->unit->lim.get_select_limit() >= records) { trace_access_scan.add("use_tmp_table", true); join->sort_by_table= (TABLE*) 1; // Must use temporary table @@ -12840,8 +12840,7 @@ end_nest_materialization(JOIN *join, JOIN_TAB *join_tab, bool end_of_records) if (unlikely((error= table->file->ha_write_tmp_row(table->record[0])))) { /* create_myisam_from_heap will generate error if needed */ - if (table->file->is_fatal_error(error, HA_CHECK_DUP) && - create_internal_tmp_table_from_heap(thd, table, + if (create_internal_tmp_table_from_heap(thd, table, nest_info->tmp_table_param.start_recinfo, &nest_info->tmp_table_param.recinfo, error, 1, NULL)) |