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/sql_expression_cache.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/sql_expression_cache.cc')
| -rw-r--r-- | sql/sql_expression_cache.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sql/sql_expression_cache.cc b/sql/sql_expression_cache.cc index 15c6cc57efb..3b6b5993073 100644 --- a/sql/sql_expression_cache.cc +++ b/sql/sql_expression_cache.cc @@ -270,10 +270,11 @@ my_bool Expression_cache_tmptable::put_value(Item *value) *(items.head_ref())= value; fill_record(table_thd, cache_table, cache_table->field, items, TRUE, TRUE); - if (table_thd->is_error()) + if (unlikely(table_thd->is_error())) goto err;; - if ((error= cache_table->file->ha_write_tmp_row(cache_table->record[0]))) + if (unlikely((error= + cache_table->file->ha_write_tmp_row(cache_table->record[0])))) { /* create_myisam_from_heap will generate error if needed */ if (cache_table->file->is_fatal_error(error, HA_CHECK_DUP)) |