diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2016-03-24 09:24:02 +0100 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2016-03-24 09:24:02 +0100 |
| commit | 2cb72dcccb640e546cf202481fa545c9cf5ded3a (patch) | |
| tree | 09bb9268562bd49684a1dc6b3632b211fe929fa5 /mysys | |
| parent | 4374501806ce2adcac73c8b90cb3509ccada7041 (diff) | |
| parent | f6d99a0d8a805873ca1846db4773afa4b0c5e1b7 (diff) | |
| download | mariadb-git-2cb72dcccb640e546cf202481fa545c9cf5ded3a.tar.gz | |
Merge branch '10.0' into 10.1
Diffstat (limited to 'mysys')
| -rw-r--r-- | mysys/ma_dyncol.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysys/ma_dyncol.c b/mysys/ma_dyncol.c index ffe818e12b9..92418e38c2e 100644 --- a/mysys/ma_dyncol.c +++ b/mysys/ma_dyncol.c @@ -4248,7 +4248,7 @@ mariadb_dyncol_unpack(DYNAMIC_COLUMN *str, { *names= my_malloc(sizeof(LEX_STRING) * header.column_count + DYNCOL_NUM_CHAR * header.column_count, MYF(0)); - nm= (char *)(names + sizeof(LEX_STRING) * header.column_count); + nm= (char *)((*names) + header.column_count); } else { |