summaryrefslogtreecommitdiff
path: root/include/my_global.h
diff options
context:
space:
mode:
authorAlexander Barkov <bar@mariadb.com>2019-06-28 09:05:12 +0400
committerAlexander Barkov <bar@mariadb.com>2019-06-28 12:37:04 +0400
commit3e7e87ddccf71ba5328c257b7d642d6803fbca3a (patch)
tree0ea22d4c533b84b2675c3d7c7555f5ad367222ac /include/my_global.h
parent323a87b591d3e9bcedb7dea09b69d9eeb1c42880 (diff)
downloadmariadb-git-3e7e87ddccf71ba5328c257b7d642d6803fbca3a.tar.gz
MDEV-19897 Rename source code variable names from utf8 to utf8mb3
Diffstat (limited to 'include/my_global.h')
-rw-r--r--include/my_global.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/my_global.h b/include/my_global.h
index 248320e301f..c0774146166 100644
--- a/include/my_global.h
+++ b/include/my_global.h
@@ -1049,8 +1049,8 @@ typedef ulong myf; /* Type of MyFlags in my_funcs */
#ifdef HAVE_CHARSET_utf8mb4
#define MYSQL_UNIVERSAL_CLIENT_CHARSET "utf8mb4"
-#elif defined(HAVE_CHARSET_utf8)
-#define MYSQL_UNIVERSAL_CLIENT_CHARSET "utf8"
+#elif defined(HAVE_CHARSET_utf8mb3)
+#define MYSQL_UNIVERSAL_CLIENT_CHARSET "utf8mb3"
#else
#define MYSQL_UNIVERSAL_CLIENT_CHARSET MYSQL_DEFAULT_CHARSET_NAME
#endif