database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge 10.3 into 10.4

Browse Source
This commit is contained in:
Marko Mäkelä
2019-04-02 11:04:54 +03:00
parent f9ab7b473a 7b42d892de
commit 5c3ff5cb93
143 changed files with 4033 additions and 2689 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
sql/handler.h
View File

@ -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