diff options
| author | Alexander Barkov <bar@mariadb.com> | 2022-12-14 18:46:27 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mariadb.com> | 2023-03-21 10:07:57 +0400 |
| commit | 8d51c6d234b1730d4ff3b2c1fe7828eeca81998b (patch) | |
| tree | 4a0d7ff0038e218b3f9de741c18fa7c8409fdf3c /sql/field.h | |
| parent | ceb0e7f944b5c252d999ac06012ac0e05925c0b2 (diff) | |
| download | mariadb-git-bb-10.11-bar-collations.tar.gz | |
MDEV-30164 System variable for default collationsbb-10.11-bar-collations
This patch adds a way to override default collations
(or "character set collations") for desired character sets.
The SQL standard says:
> Each collation known in an SQL-environment is applicable to one
> or more character sets, and for each character set, one or more
> collations are applicable to it, one of which is associated with
> it as its character set collation.
In MariaDB, character set collations has been hard-coded so far,
e.g. utf8mb4_general_ci has been a hard-coded character set collation
for utf8mb4.
This patch allows to override (globally per server, or per session)
character set collations, so for example, uca1400_ai_ci can be set as a
character set collation for Unicode character sets
(instead of compiled xxx_general_ci).
The array of overridden character set collations is stored in a new
(session and global) system variable @@character_set_collations and
can be set as a comma separated list of charset=collation pairs, e.g.:
SET @@character_set_collations='utf8mb3=uca1400_ai_ci,utf8mb4=uca1400_ai_ci';
The variable is empty by default, which mean use the hard-coded
character set collations (e.g. utf8mb4_general_ci for utf8mb4).
The variable can also be set globally by passing to the server startup command
line, and/or in my.cnf.
Diffstat (limited to 'sql/field.h')
| -rw-r--r-- | sql/field.h | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/sql/field.h b/sql/field.h index 13d80099124..48dc8676699 100644 --- a/sql/field.h +++ b/sql/field.h @@ -5340,7 +5340,9 @@ public: - find a _bin collation if the BINARY comparison style was specified, e.g.: CREATE TABLE t1 (a VARCHAR(10) BINARY) CHARSET utf8; */ - bool prepare_charset_for_string(const Column_derived_attributes *dattr); + bool prepare_charset_for_string(Charset_collation_map_st::Used *used, + const Charset_collation_map_st &map, + const Column_derived_attributes *dattr); /** Prepare a SET/ENUM field. @@ -5497,10 +5499,11 @@ public: bool check_vcol_for_key(THD *thd) const; - void set_charset_collation_attrs(const + void set_charset_collation_attrs(Charset_collation_map_st::Used *used, + const Charset_collation_map_st &map, const Lex_column_charset_collation_attrs_st &lc) { - charset= lc.charset_info(); + charset= lc.charset_info(used, map); if (lc.is_contextually_typed_collation()) flags|= CONTEXT_COLLATION_FLAG; else |