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 remote-tracking branch 'origin/11.1' into 11.2

Browse Source
This commit is contained in:
Alexander Barkov
2024-07-09 12:08:44 +04:00
parent 47fa576d67 44af9bfc67
commit 8aad19ddfc
633 changed files with 14514 additions and 11290 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
sql/sql_type.h
View File

@ -3076,6 +3076,16 @@ public:
bool aggregate(const DTCollation &dt, uint flags= 0);
bool set(DTCollation &dt1, DTCollation &dt2, uint flags= 0)
{ set(dt1); return aggregate(dt2, flags); }
bool merge_charset_and_collation(Sql_used *used,
const Charset_collation_map_st &map,
CHARSET_INFO *cs,
const Lex_extended_collation_st &cl,
my_repertoire_t repertoire);
bool merge_collation(Sql_used *used,
const Charset_collation_map_st &map,
const Lex_extended_collation_st &cl,
my_repertoire_t repertoire,
bool allow_ignorable_with_context_collation);
const char *derivation_name() const
{
switch(derivation)
@ -3604,13 +3614,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 +3628,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;