diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2017-12-12 19:28:26 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2017-12-12 19:28:26 +0200 |
| commit | ce07d09fd3eb1abbfe3c2ff75a78ef4eacf34bd7 (patch) | |
| tree | 006fe23182bd63ca669c55ef7f52b6374e7c0df2 /mysys | |
| parent | de76cbdcb0728b80c0f7b453b24b0b81f653e450 (diff) | |
| parent | 622466644dda1e3c72f5fe276e3a8127b20c1182 (diff) | |
| download | mariadb-git-ce07d09fd3eb1abbfe3c2ff75a78ef4eacf34bd7.tar.gz | |
Merge 10.0 into 10.1
Diffstat (limited to 'mysys')
| -rw-r--r-- | mysys/ma_dyncol.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/mysys/ma_dyncol.c b/mysys/ma_dyncol.c index e3357e389c2..c46e9cd4456 100644 --- a/mysys/ma_dyncol.c +++ b/mysys/ma_dyncol.c @@ -4183,8 +4183,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; } } |