diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2017-12-13 23:14:15 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2017-12-14 08:40:01 +0200 |
| commit | ece9c54e1062ea70b8cf31d69c1ce4db9ba12f7d (patch) | |
| tree | 7f7fd7ea472ff807629fd5abe3a540072307fc49 /mysys/ma_dyncol.c | |
| parent | 58eb4e5db9e333768cc927d5d5a63d68fbd74548 (diff) | |
| parent | 7be5b6f0e6170461e7ccc6ec7947436af2e43e41 (diff) | |
| download | mariadb-git-ece9c54e1062ea70b8cf31d69c1ce4db9ba12f7d.tar.gz | |
Merge 10.1 into 10.2
Diffstat (limited to 'mysys/ma_dyncol.c')
| -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 125b3a4632d..3c15e373182 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; } } |