database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-07 00:04:31 +03:00
Code Activity

Merge 10.6 into 10.7

Browse Source
This commit is contained in:
Marko Mäkelä
2021-11-09 09:40:29 +02:00
parent 662fe08232 ba4f8e317d
commit 06988bdcaa
60 changed files with 1773 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
sql/table.cc
View File

@@ -1119,6 +1119,8 @@ static void mysql57_calculate_null_position(TABLE_SHARE *share,
}
}
static bool fix_and_check_vcol_expr(THD *thd, TABLE *table,
Virtual_column_info *vcol);
/** Parse TABLE_SHARE::vcol_defs
@@ -1304,6 +1306,9 @@ bool parse_vcol_defs(THD *thd, MEM_ROOT *mem_root, TABLE *table,
Virtual_column_info *v= new (mem_root) Virtual_column_info();
field->vcol_info= v;
field->vcol_info->expr= hash_item;
field->vcol_info->set_vcol_type(VCOL_USING_HASH);
if (fix_and_check_vcol_expr(thd, table, v))
goto end;
key->user_defined_key_parts= key->ext_key_parts= key->usable_key_parts= 1;
key->key_part+= parts;