diff options
| author | Alexander Barkov <bar@mariadb.org> | 2018-01-29 12:44:20 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mariadb.org> | 2018-01-29 12:44:20 +0400 |
| commit | c7a2f23a7b751cd54dbdcff46a3e7bc1eabe4c02 (patch) | |
| tree | 5f884e1fdf15a1a7d3738b1dff17a91d2c26623f /sql/table.cc | |
| parent | b4a2baffa82e5c07b96a1c752228560dcac1359b (diff) | |
| parent | b12430adc716be51810953920448563c87fe0521 (diff) | |
| download | mariadb-git-c7a2f23a7b751cd54dbdcff46a3e7bc1eabe4c02.tar.gz | |
Merge remote-tracking branch 'origin/bb-10.2-ext' into 10.3
Diffstat (limited to 'sql/table.cc')
| -rw-r--r-- | sql/table.cc | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/sql/table.cc b/sql/table.cc index e6b6ea63e0e..10d1d737222 100644 --- a/sql/table.cc +++ b/sql/table.cc @@ -1174,7 +1174,7 @@ int TABLE_SHARE::init_from_binary_frm_image(THD *thd, bool write, char *keynames, *names, *comment_pos; const uchar *forminfo, *extra2; const uchar *frm_image_end = frm_image + frm_length; - uchar *record, *null_flags, *null_pos, *mysql57_vcol_null_pos= 0; + uchar *record, *null_flags, *null_pos, *UNINIT_VAR(mysql57_vcol_null_pos); const uchar *disk_buff, *strpos; ulong pos, record_offset; ulong rec_buff_length; @@ -2520,7 +2520,10 @@ int TABLE_SHARE::init_from_binary_frm_image(THD *thd, bool write, reg_field= share->field[field_nr]; } else - reg_field= 0; // Safety + { + reg_field= 0; + DBUG_ASSERT(name_length); + } vcol_screen_pos+= FRM_VCOL_NEW_HEADER_SIZE; vcol_info->set_vcol_type((enum_vcol_info_type) type); |