mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-15 19:37:16 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge 10.3 into 10.4

Browse source
This commit is contained in:
Marko Mäkelä 2020-09-04 12:39:09 +03:00
commit 7f8cd326c6
2 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
storage/innobase/handler/ha_innodb.cc
View file

@ -7284,6 +7284,8 @@ build_template_field(
templ = prebuilt->mysql_template + prebuilt->n_template++;
MEM_UNDEFINED(templ, sizeof *templ);
templ->rec_field_is_prefix = FALSE;
templ->rec_prefix_field_no = ULINT_UNDEFINED;
templ->is_virtual = !field->stored_in_db();
if (!templ->is_virtual) {
@ -7345,8 +7347,6 @@ build_template_field(
<< " query "
<< innobase_get_stmt_unsafe(current_thd, &size);
}
templ->rec_field_is_prefix = FALSE;
templ->rec_prefix_field_no = ULINT_UNDEFINED;
if (dict_index_is_clust(index)) {
templ->rec_field_no = templ->clust_rec_field_no;
@ -7364,7 +7364,6 @@ build_template_field(
DBUG_ASSERT(!ha_innobase::omits_virtual_cols(*table->s));
col = &dict_table_get_nth_v_col(index->table, v_no)->m_col;
templ->clust_rec_field_no = v_no;
templ->rec_prefix_field_no = ULINT_UNDEFINED;
if (dict_index_is_clust(index)) {
templ->rec_field_no = templ->clust_rec_field_no;