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

MDEV-23154 Add a data type my_repertoire_t

Browse Source
This commit is contained in:
Alexander Barkov
2020-07-13 16:19:49 +04:00
parent d34eb4b1f6
commit 5967dfdbbf
9 changed files with 47 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
sql/sql_type.h
View File

@ -2712,6 +2712,19 @@ public:
#define MY_REPERTOIRE_NUMERIC MY_REPERTOIRE_ASCII
static inline my_repertoire_t operator|(const my_repertoire_t a,
const my_repertoire_t b)
{
return (my_repertoire_t) ((uint) a | (uint) b);
}
static inline my_repertoire_t &operator|=(my_repertoire_t &a,
const my_repertoire_t b)
{
return a= (my_repertoire_t) ((uint) a | (uint) b);
}
enum Derivation
{
DERIVATION_IGNORABLE= 6,
@ -2733,7 +2746,7 @@ class DTCollation {
public:
CHARSET_INFO *collation;
enum Derivation derivation;
uint repertoire;
my_repertoire_t repertoire;
void set_repertoire_from_charset(CHARSET_INFO *cs)
{
@ -2769,7 +2782,7 @@ public:
}
DTCollation(CHARSET_INFO *collation_arg,
Derivation derivation_arg,
uint repertoire_arg)
my_repertoire_t repertoire_arg)
:collation(collation_arg),
derivation(derivation_arg),
repertoire(repertoire_arg)
@ -2786,7 +2799,7 @@ public:
}
void set(CHARSET_INFO *collation_arg,
Derivation derivation_arg,
uint repertoire_arg)
my_repertoire_t repertoire_arg)
{
collation= collation_arg;
derivation= derivation_arg;