diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2016-03-25 10:36:33 +0100 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2016-03-25 10:36:33 +0100 |
| commit | 2481ed22455d430bce889cb25865b1f878c348ae (patch) | |
| tree | 5e3dbd5c8f6d12bba0717aeb4244903a77919d36 /mysys | |
| parent | 3be95ee061b8695922981c67480b80167fb3f492 (diff) | |
| parent | 9f5b285662ed8c13d6e87d8baf2f0ad4484d4a85 (diff) | |
| download | mariadb-git-2481ed22455d430bce889cb25865b1f878c348ae.tar.gz | |
Merge branch '10.1' into 10.2
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 { |