diff options
| author | Rich Prohaska <prohaska@tokutek.com> | 2014-12-07 13:17:45 -0500 |
|---|---|---|
| committer | Rich Prohaska <prohaska@tokutek.com> | 2014-12-07 13:17:45 -0500 |
| commit | e149ab9da95bc19a6a95ea83891e809acc2b1575 (patch) | |
| tree | aa4cf1135f60bfd4bf65cf18719eb55baa1bc27e /storage/tokudb/ha_tokudb.cc | |
| parent | e790efdf80efec0e523dca42e63a016e5dde3326 (diff) | |
| download | mariadb-git-e149ab9da95bc19a6a95ea83891e809acc2b1575.tar.gz | |
run on mariadb 10 with its safe malloc
Diffstat (limited to 'storage/tokudb/ha_tokudb.cc')
| -rw-r--r-- | storage/tokudb/ha_tokudb.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/storage/tokudb/ha_tokudb.cc b/storage/tokudb/ha_tokudb.cc index d5168150298..578b6c01856 100644 --- a/storage/tokudb/ha_tokudb.cc +++ b/storage/tokudb/ha_tokudb.cc @@ -1731,7 +1731,7 @@ int ha_tokudb::initialize_share(const char* name, int mode) { // initialize cardinality info from the status dictionary share->n_rec_per_key = tokudb::compute_total_key_parts(table_share); - share->rec_per_key = (uint64_t *) tokudb_my_realloc(share->rec_per_key, share->n_rec_per_key * sizeof (uint64_t), MYF(MY_FAE)); + share->rec_per_key = (uint64_t *) tokudb_my_realloc(share->rec_per_key, share->n_rec_per_key * sizeof (uint64_t), MYF(MY_FAE + MY_ALLOW_ZERO_PTR)); error = tokudb::get_card_from_status(share->status_block, txn, share->n_rec_per_key, share->rec_per_key); if (error) { for (uint i = 0; i < share->n_rec_per_key; i++) |