summaryrefslogtreecommitdiff
path: root/sql
diff options
context:
space:
mode:
authorAleksey Midenkov <midenok@gmail.com>2021-09-28 16:00:41 +0300
committerAleksey Midenkov <midenok@gmail.com>2021-10-11 12:26:43 +0300
commit89936f11e965472d65fbee1e240f3d4b7726e77f (patch)
tree1efff51b571440867c184fdbfb3720b8c507066e /sql
parent275e7d23f73f036b31b2d67f9256008c8e5561e1 (diff)
downloadmariadb-git-89936f11e965472d65fbee1e240f3d4b7726e77f.tar.gz
MDEV-18278 Misleading error message in error log upon failed table creation
If error_reported is not set upper caller open_table_from_share() throws error ER_NOT_FORM_FILE itself via open_table_error().
Diffstat (limited to 'sql')
-rw-r--r--sql/table.cc3
1 files changed, 3 insertions, 0 deletions
diff --git a/sql/table.cc b/sql/table.cc
index 281b8f82abc..87b3c158a67 100644
--- a/sql/table.cc
+++ b/sql/table.cc
@@ -1157,7 +1157,10 @@ bool parse_vcol_defs(THD *thd, MEM_ROOT *mem_root, TABLE *table,
if (check_vcol_forward_refs(field, field->vcol_info) ||
check_vcol_forward_refs(field, field->check_constraint) ||
check_vcol_forward_refs(field, field->default_value))
+ {
+ *error_reported= true;
goto end;
+ }
}
res=0;