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_tvc.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_tvc.cc')
| -rw-r--r-- | sql/sql_tvc.cc | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/sql/sql_tvc.cc b/sql/sql_tvc.cc index 7004c32e602..188ba8c4629 100644 --- a/sql/sql_tvc.cc +++ b/sql/sql_tvc.cc @@ -221,6 +221,12 @@ bool table_value_constr::prepare(THD *thd, SELECT_LEX *sl, uint cnt= first_elem->elements; Type_holder *holders; + if (cnt == 0) + { + my_error(ER_EMPTY_ROW_IN_TVC, MYF(0)); + DBUG_RETURN(true); + } + if (fix_fields_for_tvc(thd, li)) DBUG_RETURN(true); @@ -249,7 +255,7 @@ bool table_value_constr::prepare(THD *thd, SELECT_LEX *sl, sl->item_list.push_back(new_holder); } - if (thd->is_fatal_error) + if (unlikely(thd->is_fatal_error)) DBUG_RETURN(true); // out of memory result= tmp_result; |