diff options
| author | Igor Babaev <igor@askmonty.org> | 2018-06-03 10:34:41 -0700 |
|---|---|---|
| committer | Igor Babaev <igor@askmonty.org> | 2018-06-03 10:34:41 -0700 |
| commit | cab1d6382623f0611335caf2cd056aa7ee04d7cd (patch) | |
| tree | c33b8118a77a78d87d8fb01e908dbfa6a67ca9a2 /sql/unireg.cc | |
| parent | ffe83e8e7bef32eb2a80aad2d382f0b023dd3a44 (diff) | |
| parent | ee5124d714ea01f4e1bd6decf6da38b05c1009ad (diff) | |
| download | mariadb-git-cab1d6382623f0611335caf2cd056aa7ee04d7cd.tar.gz | |
Merge branch '10.3' into 10.4
Diffstat (limited to 'sql/unireg.cc')
| -rw-r--r-- | sql/unireg.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/unireg.cc b/sql/unireg.cc index 26f02c8983a..796101e0efb 100644 --- a/sql/unireg.cc +++ b/sql/unireg.cc @@ -118,7 +118,7 @@ vers_get_field(HA_CREATE_INFO *create_info, List<Create_field> &create_fields, b List_iterator<Create_field> it(create_fields); Create_field *sql_field = NULL; - const LString_i row_field= row_start ? create_info->vers_info.as_row.start + const Lex_ident row_field= row_start ? create_info->vers_info.as_row.start : create_info->vers_info.as_row.end; DBUG_ASSERT(row_field); @@ -194,7 +194,7 @@ LEX_CUSTRING build_frm_image(THD *thd, const LEX_CSTRING *table, error= pack_vcols(&vcols, create_fields, create_info->check_constraint_list); thd->variables.sql_mode= save_sql_mode; - if (error) + if (unlikely(error)) DBUG_RETURN(frm); if (vcols.length()) @@ -202,7 +202,7 @@ LEX_CUSTRING build_frm_image(THD *thd, const LEX_CSTRING *table, error= pack_header(thd, forminfo, create_fields, create_info, (ulong)data_offset, db_file); - if (error) + if (unlikely(error)) DBUG_RETURN(frm); reclength= uint2korr(forminfo+266); |