diff options
| author | Rucha Deodhar <rucha.deodhar@mariadb.com> | 2021-02-15 01:39:37 +0530 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2021-05-19 06:48:36 +0200 |
| commit | 2fdb556e045e9918410086eeaac5a94a4c028626 (patch) | |
| tree | 1420013b4e76b3192cb8ac33406c818d3ecfc3af /sql/sp.h | |
| parent | c366845a0b5c08285c958cf1500b3b7906ecf8d4 (diff) | |
| download | mariadb-git-2fdb556e045e9918410086eeaac5a94a4c028626.tar.gz | |
MDEV-8334: Rename utf8 to utf8mb3
This patch changes the main name of 3 byte character set from utf8 to
utf8mb3. New old_mode UTF8_IS_UTF8MB3 is added and set TRUE by default,
so that utf8 would mean utf8mb3. If not set, utf8 would mean utf8mb4.
Diffstat (limited to 'sql/sp.h')
| -rw-r--r-- | sql/sp.h | 5 |
1 files changed, 3 insertions, 2 deletions
@@ -657,12 +657,13 @@ extern "C" uchar* sp_sroutine_key(const uchar *ptr, size_t *plen, */ TABLE *open_proc_table_for_read(THD *thd); -bool load_charset(MEM_ROOT *mem_root, +bool load_charset(THD *thd, + MEM_ROOT *mem_root, Field *field, CHARSET_INFO *dflt_cs, CHARSET_INFO **cs); -bool load_collation(MEM_ROOT *mem_root, +bool load_collation(THD *thd,MEM_ROOT *mem_root, Field *field, CHARSET_INFO *dflt_cl, CHARSET_INFO **cl); |