summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorOleksandr Byelkin <sanja@mariadb.com>2017-11-13 16:30:02 +0100
committerOleksandr Byelkin <sanja@mariadb.com>2017-11-14 10:49:46 +0100
commit2913f615f050f356f7be178e5d91650b86b33e4e (patch)
tree216193d0dabedf52c35966d6bd60b9bea3c81995 /include
parentc0e10f375ad619d825ef7c21232cf5946bdf5be7 (diff)
downloadmariadb-git-2913f615f050f356f7be178e5d91650b86b33e4e.tar.gz
MDEV-8949: COLUMN_CREATE unicode name breakage
Use utf-mb4 if it is possible.
Diffstat (limited to 'include')
-rw-r--r--include/ma_dyncol.h6
1 files changed, 6 insertions, 0 deletions
diff --git a/include/ma_dyncol.h b/include/ma_dyncol.h
index cb03ccb5382..300474e061e 100644
--- a/include/ma_dyncol.h
+++ b/include/ma_dyncol.h
@@ -63,6 +63,12 @@ typedef struct st_mysql_lex_string LEX_STRING;
/* NO and OK is the same used just to show semantics */
#define ER_DYNCOL_NO ER_DYNCOL_OK
+#ifdef HAVE_CHARSET_utf8mb4
+#define DYNCOL_UTF (&my_charset_utf8mb4_general_ci)
+#else
+#define DYNCOL_UTF (&my_charset_utf8_general_ci)
+#endif
+
enum enum_dyncol_func_result
{
ER_DYNCOL_OK= 0,