diff options
author | Sergei Golubchik <serg@mariadb.org> | 2014-10-15 12:59:13 +0200 |
---|---|---|
committer | Sergei Golubchik <serg@mariadb.org> | 2014-10-15 12:59:13 +0200 |
commit | f62c12b405ba7ec80b8e2490856b83c6f5899211 (patch) | |
tree | 010605c7f145da6ea6ac14b39abc4cf700d619b1 /mysys/ma_dyncol.c | |
parent | f947f73b2b6d2bd246b81a9038224d2a85777520 (diff) | |
parent | f1afc003eefe0aafd3e070c7453d9e029d8445a8 (diff) | |
download | mariadb-git-f62c12b405ba7ec80b8e2490856b83c6f5899211.tar.gz |
Merge 10.0.14 into 10.1
Diffstat (limited to 'mysys/ma_dyncol.c')
-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 3b5e05f1b01..c0508b97922 100644 --- a/mysys/ma_dyncol.c +++ b/mysys/ma_dyncol.c @@ -1610,7 +1610,7 @@ dynamic_new_column_store(DYNAMIC_COLUMN *str, my_bool new_str) { struct st_service_funcs *fmt= fmt_data + hdr->format; - void **columns_order; + void **UNINIT_VAR(columns_order); uchar *element; uint i; enum enum_dyncol_func_result rc= ER_DYNCOL_RESOURCE; |