diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2020-02-14 16:42:23 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2020-03-10 19:24:22 +0100 |
| commit | 2ac3121af2767186c489054db5d4871d04b8eef4 (patch) | |
| tree | 39de7dcc95c29fbd3d1ce3167262c61404e37743 /mysys/ma_dyncol.c | |
| parent | 0ea717f51a152afdb3791195c4a25ee0baa2faac (diff) | |
| download | mariadb-git-2ac3121af2767186c489054db5d4871d04b8eef4.tar.gz | |
perfschema - various collateral cleanups and small changes
Diffstat (limited to 'mysys/ma_dyncol.c')
| -rw-r--r-- | mysys/ma_dyncol.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/mysys/ma_dyncol.c b/mysys/ma_dyncol.c index 0085c375aa1..2068d0d818c 100644 --- a/mysys/ma_dyncol.c +++ b/mysys/ma_dyncol.c @@ -3925,10 +3925,8 @@ mariadb_dyncol_val_str(DYNAMIC_STRING *str, DYNAMIC_COLUMN_VALUE *val, } if ((alloc= (char *)my_malloc(bufflen, MYF(0)))) { - len= my_convert(alloc, bufflen, cs, - from, (uint32)len, - val->x.string.charset, - &dummy_errors); + len= my_convert(alloc, bufflen, cs, from, (uint32)len, + val->x.string.charset, &dummy_errors); from= alloc; } else |