summaryrefslogtreecommitdiff
path: root/mysys
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 /mysys
parentc0e10f375ad619d825ef7c21232cf5946bdf5be7 (diff)
downloadmariadb-git-2913f615f050f356f7be178e5d91650b86b33e4e.tar.gz
MDEV-8949: COLUMN_CREATE unicode name breakage
Use utf-mb4 if it is possible.
Diffstat (limited to 'mysys')
-rw-r--r--mysys/ma_dyncol.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/mysys/ma_dyncol.c b/mysys/ma_dyncol.c
index d0d6254d11c..9f6df107316 100644
--- a/mysys/ma_dyncol.c
+++ b/mysys/ma_dyncol.c
@@ -4184,8 +4184,7 @@ mariadb_dyncol_json_internal(DYNAMIC_COLUMN *str, DYNAMIC_STRING *json,
}
else
{
- if ((rc= mariadb_dyncol_val_str(json, &val,
- &my_charset_utf8_general_ci, '"')) < 0)
+ if ((rc= mariadb_dyncol_val_str(json, &val, DYNCOL_UTF, '"')) < 0)
goto err;
}
}