diff options
| author | Galina Shalygina <galina.shalygina@mariadb.com> | 2018-06-01 21:57:10 +0200 |
|---|---|---|
| committer | Galina Shalygina <galina.shalygina@mariadb.com> | 2018-06-01 21:57:10 +0200 |
| commit | 6db465d7ce455cf75ec224108cbe61ca8be63d3d (patch) | |
| tree | 9648ff1fc677eebb60b278c2e2c13131934ed2a0 /sql/group_by_handler.cc | |
| parent | ffe83e8e7bef32eb2a80aad2d382f0b023dd3a44 (diff) | |
| parent | 4a49f7f88cfa82ae6eb8e7b5a528e91416b33b52 (diff) | |
| download | mariadb-git-shagalla-10.4.tar.gz | |
Merge 10.3.7 into 10.4shagalla-10.4
Diffstat (limited to 'sql/group_by_handler.cc')
| -rw-r--r-- | sql/group_by_handler.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/group_by_handler.cc b/sql/group_by_handler.cc index e75800d8986..c92df8922ce 100644 --- a/sql/group_by_handler.cc +++ b/sql/group_by_handler.cc @@ -63,7 +63,7 @@ int Pushdown_query::execute(JOIN *join) while (!(err= handler->next_row())) { - if (thd->check_killed()) + if (unlikely(thd->check_killed())) { thd->send_kill_message(); handler->end_scan(); @@ -78,7 +78,7 @@ int Pushdown_query::execute(JOIN *join) if ((err= table->file->ha_write_tmp_row(table->record[0]))) { bool is_duplicate; - if (!table->file->is_fatal_error(err, HA_CHECK_DUP)) + if (likely(!table->file->is_fatal_error(err, HA_CHECK_DUP))) continue; // Distinct elimination if (create_internal_tmp_table_from_heap(thd, table, @@ -98,7 +98,7 @@ int Pushdown_query::execute(JOIN *join) { int error; /* result < 0 if row was not accepted and should not be counted */ - if ((error= join->result->send_data(*join->fields))) + if (unlikely((error= join->result->send_data(*join->fields)))) { handler->end_scan(); DBUG_RETURN(error < 0 ? 0 : -1); |