1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

MDEV-19027 create_table_def fails when virtual column is present between stored columns

Browse Source 
- create_table_def() misconstructs the dict_table_t by ignoring the stored
columns of the table if virtual column is present between stored columns.
This commit is contained in:
Thirunarayanan Balathandayuthapani 2019-05-27 21:28:33 +05:30
parent 35522455e0
commit b8b74e141d
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
storage/innobase/handler/ha_innodb.cc
View File

@ -11016,7 +11016,6 @@ create_table_info_t::create_table_def()
ulint binary_type; ulint binary_type;
ulint long_true_varchar; ulint long_true_varchar;
ulint charset_no; ulint charset_no;
ulint j = 0;
ulint doc_id_col = 0; ulint doc_id_col = 0;
ibool has_doc_id_col = FALSE; ibool has_doc_id_col = FALSE;
mem_heap_t* heap; mem_heap_t* heap;
@ -11106,7 +11105,7 @@ error_ret:
heap = mem_heap_create(1000); heap = mem_heap_create(1000);
for (ulint i = 0; i < n_cols; i++) { for (ulint i = 0, j = 0; j < n_cols; i++) {
Field* field = m_form->field[i]; Field* field = m_form->field[i];
col_type = get_innobase_type_from_mysql_type( col_type = get_innobase_type_from_mysql_type(
@ -11214,10 +11213,16 @@ err_col:
dict_mem_table_add_s_col( dict_mem_table_add_s_col(
table, 0); table, 0);
} }
if (is_virtual && omit_virtual) {
continue;
}
j++;
} }
if (num_v) { if (num_v) {
for (ulint i = 0; i < n_cols; i++) { for (ulint i = 0, j = 0; i < n_cols; i++) {
dict_v_col_t* v_col; dict_v_col_t* v_col;
const Field* field = m_form->field[i]; const Field* field = m_form->field[i];