diff options
| author | Sergei Petrunia <psergey@askmonty.org> | 2019-08-10 01:46:50 +0300 |
|---|---|---|
| committer | Sergei Petrunia <psergey@askmonty.org> | 2019-08-10 01:46:50 +0300 |
| commit | 3b234104ae227556f06c2c3d227e5fc51692c8fa (patch) | |
| tree | f445459c20a6c5a26c8a59cdf49c5ca672f03577 | |
| parent | 6765cc607764c920bc5fbf4128bb526b73f15c2e (diff) | |
| download | mariadb-git-3b234104ae227556f06c2c3d227e5fc51692c8fa.tar.gz | |
MDEV-16955: rocksdb_sys_vars.rocksdb_update_cf_options_basic
... produces "bytes lost" warnings
When rocksdb_validate_update_cf_options() returns an error,
the update won't happen.
Free the copy of the string in this case.
| -rw-r--r-- | storage/rocksdb/ha_rocksdb.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/storage/rocksdb/ha_rocksdb.cc b/storage/rocksdb/ha_rocksdb.cc index 4f256b10abc..613ac0884a7 100644 --- a/storage/rocksdb/ha_rocksdb.cc +++ b/storage/rocksdb/ha_rocksdb.cc @@ -14314,6 +14314,8 @@ static int rocksdb_validate_update_cf_options( // then there's no point to proceed. if (!Rdb_cf_options::parse_cf_options(str, &option_map)) { my_error(ER_WRONG_VALUE_FOR_VAR, MYF(0), "rocksdb_update_cf_options", str); + // Free what we've copied with my_strdup above. + my_free((void*)(*(const char **)save)); return HA_EXIT_FAILURE; } // Loop through option_map and create missing column families |