summaryrefslogtreecommitdiff
path: root/client/mariadb-conv.cc
diff options
context:
space:
mode:
authorRucha Deodhar <rucha.deodhar@mariadb.com>2021-02-15 01:39:37 +0530
committerOleksandr Byelkin <sanja@mariadb.com>2021-05-19 06:48:36 +0200
commit2fdb556e045e9918410086eeaac5a94a4c028626 (patch)
tree1420013b4e76b3192cb8ac33406c818d3ecfc3af /client/mariadb-conv.cc
parentc366845a0b5c08285c958cf1500b3b7906ecf8d4 (diff)
downloadmariadb-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 'client/mariadb-conv.cc')
-rw-r--r--client/mariadb-conv.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/client/mariadb-conv.cc b/client/mariadb-conv.cc
index 835c6a2abe2..1abbd135e26 100644
--- a/client/mariadb-conv.cc
+++ b/client/mariadb-conv.cc
@@ -43,7 +43,7 @@ public:
{ }
static CHARSET_INFO *csinfo_by_name(const char *csname)
{
- return get_charset_by_csname(csname, MY_CS_PRIMARY, MYF(0));
+ return get_charset_by_csname(csname, MY_CS_PRIMARY, MYF(MY_UTF8_IS_UTF8MB3));
}
CHARSET_INFO *csinfo_from() const
{