diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-03-19 14:30:11 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-03-19 14:35:05 +0200 |
| commit | 1efda582ade2e0bb073cc267d0abe11922371d94 (patch) | |
| tree | 3bc8304e9f8908a63708604b654296e91cf6bada /storage/innobase/handler/ha_innodb.h | |
| parent | 9471dbafcecef384e60aca12e03aefcfdf6c04f0 (diff) | |
| download | mariadb-git-1efda582ade2e0bb073cc267d0abe11922371d94.tar.gz | |
Replace innobase_is_v_fld() with Field::stored_in_db()
The macro innobase_is_v_fld() turns out to be equivalent with
the opposite of Field::stored_in_db(). Remove the macro and
invoke the member function directly.
innodb_base_col_setup_for_stored(): Simplify a condition to only
check Field::vcol_info.
innobase_create_index_def(): Replace some redundant code with
DBUG_ASSERT().
Diffstat (limited to 'storage/innobase/handler/ha_innodb.h')
| -rw-r--r-- | storage/innobase/handler/ha_innodb.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/storage/innobase/handler/ha_innodb.h b/storage/innobase/handler/ha_innodb.h index 88298411379..76a9b08c4c6 100644 --- a/storage/innobase/handler/ha_innodb.h +++ b/storage/innobase/handler/ha_innodb.h @@ -846,10 +846,8 @@ innodb_base_col_setup_for_stored( const Field* field, dict_s_col_t* s_col); -/** whether this is a stored column */ +/** whether this is a stored generated column */ #define innobase_is_s_fld(field) ((field)->vcol_info && (field)->stored_in_db()) -/** whether this is a computed virtual column */ -#define innobase_is_v_fld(field) ((field)->vcol_info && !(field)->stored_in_db()) /** Always normalize table name to lower case on Windows */ #ifdef _WIN32 |