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.6 into 10.11

Browse Source
This commit is contained in:
Marko Mäkelä
2024-06-27 10:26:09 +03:00
parent 77c465d5aa c9212b7a43
commit 27a3366663
372 changed files with 7652 additions and 6504 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
sql/sql_type.h
View File

@ -3604,13 +3604,13 @@ public:
class Vers_type_timestamp: public Vers_type_handler
{
public:
virtual vers_kind_t kind() const
vers_kind_t kind() const override
{
return VERS_TIMESTAMP;
}
bool check_sys_fields(const LEX_CSTRING &table_name,
const Column_definition *row_start,
const Column_definition *row_end) const;
const Column_definition *row_end) const override;
};
extern Vers_type_timestamp vers_type_timestamp;
@ -3618,13 +3618,13 @@ extern Vers_type_timestamp vers_type_timestamp;
class Vers_type_trx: public Vers_type_handler
{
public:
virtual vers_kind_t kind() const
vers_kind_t kind() const override
{
return VERS_TRX_ID;
}
bool check_sys_fields(const LEX_CSTRING &table_name,
const Column_definition *row_start,
const Column_definition *row_end) const;
const Column_definition *row_end) const override;
};
extern MYSQL_PLUGIN_IMPORT Vers_type_trx vers_type_trx;