From 89936f11e965472d65fbee1e240f3d4b7726e77f Mon Sep 17 00:00:00 2001 From: Aleksey Midenkov Date: Tue, 28 Sep 2021 16:00:41 +0300 Subject: 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(). --- sql/table.cc | 3 +++ 1 file changed, 3 insertions(+) (limited to 'sql/table.cc') 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; -- cgit v1.2.1 From 911c803db19de7ffd45c39ff3614abcf19c63536 Mon Sep 17 00:00:00 2001 From: Aleksey Midenkov Date: Mon, 11 Oct 2021 13:36:06 +0300 Subject: MDEV-22660 System versioning cleanups - Cleaned up Vers_parse_info::check_sys_fields(); - Renamed VERS_SYS_START_FLAG, VERS_SYS_END_FLAG to VERS_ROW_START, VERS_ROW_END. --- sql/table.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'sql/table.cc') diff --git a/sql/table.cc b/sql/table.cc index 18bb28e0863..0bef0fc29a1 100644 --- a/sql/table.cc +++ b/sql/table.cc @@ -2059,9 +2059,9 @@ int TABLE_SHARE::init_from_binary_frm_image(THD *thd, bool write, if (versioned) { if (i == row_start_field) - flags|= VERS_SYS_START_FLAG; + flags|= VERS_ROW_START; else if (i == row_end_field) - flags|= VERS_SYS_END_FLAG; + flags|= VERS_ROW_END; if (flags & VERS_SYSTEM_FIELD) { -- cgit v1.2.1