diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-04-02 11:04:54 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-04-02 11:04:54 +0300 |
| commit | 5c3ff5cb93f8363820d506cdad3daafbc944f03b (patch) | |
| tree | f5671e95dabd8ced0c7925e54b351bd704e41bcf /sql/handler.h | |
| parent | f9ab7b473a935141f85d27994d0faf3433a73144 (diff) | |
| parent | 7b42d892de6acc04490f5cb6b8355c72b8f1a406 (diff) | |
| download | mariadb-git-5c3ff5cb93f8363820d506cdad3daafbc944f03b.tar.gz | |
Merge 10.3 into 10.4
Diffstat (limited to 'sql/handler.h')
| -rw-r--r-- | sql/handler.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/sql/handler.h b/sql/handler.h index 4c1a53cc570..d7559a21445 100644 --- a/sql/handler.h +++ b/sql/handler.h @@ -2056,7 +2056,7 @@ public: TABLE_LIST &src_table, TABLE_LIST &table); bool check_sys_fields(const Lex_table_name &table_name, const Lex_table_name &db, - Alter_info *alter_info, bool native); + Alter_info *alter_info); /** At least one field was specified 'WITH/WITHOUT SYSTEM VERSIONING'. @@ -2140,8 +2140,6 @@ struct Table_scope_and_contents_source_pod_st // For trivial members bool table_was_deleted; sequence_definition *seq_create_info; - bool vers_native(THD *thd) const; - void init() { bzero(this, sizeof(*this)); @@ -3576,6 +3574,10 @@ public: ha_pre_index_end() : pre_inited == RND ? ha_pre_rnd_end() : 0 ); } + virtual bool vers_can_native(THD *thd) + { + return ht->flags & HTON_NATIVE_SYS_VERSIONING; + } /** @brief |