diff options
author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-03-25 11:02:03 +0200 |
---|---|---|
committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-03-25 11:03:19 +0200 |
commit | c3a6c683e2bba4111a69a34303af13ff9a45b46a (patch) | |
tree | d769537a9ef4b6602ce548bf4ccf037e1a78519f /storage/innobase/handler/ha_innodb.h | |
parent | f03f4da66373161d604b8ecf3c23ae18d08c0461 (diff) | |
parent | 72b934e3f7d5f0c717cb98b718c9529c74741b4a (diff) | |
download | mariadb-git-c3a6c683e2bba4111a69a34303af13ff9a45b46a.tar.gz |
Merge 10.2 into 10.3
Diffstat (limited to 'storage/innobase/handler/ha_innodb.h')
-rw-r--r-- | storage/innobase/handler/ha_innodb.h | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/storage/innobase/handler/ha_innodb.h b/storage/innobase/handler/ha_innodb.h index 4cc99581c3e..945aeacfd20 100644 --- a/storage/innobase/handler/ha_innodb.h +++ b/storage/innobase/handler/ha_innodb.h @@ -22,6 +22,8 @@ this program; if not, write to the Free Software Foundation, Inc., # include "../../../wsrep/wsrep_api.h" #endif /* WITH_WSREP */ +#include "table.h" + /* The InnoDB handler: the interface between MySQL and InnoDB. */ /** "GEN_CLUST_INDEX" is the name reserved for InnoDB default @@ -422,8 +424,15 @@ public: Item* idx_cond_push(uint keyno, Item* idx_cond); /* @} */ -protected: + /** Check if InnoDB is not storing virtual column metadata for a table. + @param s table definition (based on .frm file) + @return whether InnoDB will omit virtual column metadata */ + static bool omits_virtual_cols(const TABLE_SHARE& s) + { + return s.frm_version<FRM_VER_EXPRESSSIONS && s.virtual_fields; + } +protected: /** MySQL calls this method at the end of each statement. This method exists for readability only, called from reset(). The name reset() @@ -440,7 +449,6 @@ protected: @see build_template() */ void reset_template(); -protected: inline void update_thd(THD* thd); void update_thd(); |