diff options
| author | He Zhenxing <zhenxing.he@sun.com> | 2009-12-04 13:43:38 +0800 |
|---|---|---|
| committer | He Zhenxing <zhenxing.he@sun.com> | 2009-12-04 13:43:38 +0800 |
| commit | eaf517bc7d60ab0d2fed181bed5dce38880461f7 (patch) | |
| tree | 9f7a71e7ab18ed6d7e0173720545075acebd51bf /plugin/semisync | |
| parent | 16ec25c0a8438473d2273722de37ade855615ea4 (diff) | |
| download | mariadb-git-eaf517bc7d60ab0d2fed181bed5dce38880461f7.tar.gz | |
Post fix for previous patch of Bug#49020
Added back n_frees, use 'clear' instead of 'free' since memory is
not freed here.
Diffstat (limited to 'plugin/semisync')
| -rw-r--r-- | plugin/semisync/semisync_master.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/plugin/semisync/semisync_master.cc b/plugin/semisync/semisync_master.cc index 526797a3c4a..c2e329e1fe4 100644 --- a/plugin/semisync/semisync_master.cc +++ b/plugin/semisync/semisync_master.cc @@ -280,7 +280,7 @@ int ActiveTranx::clear_active_tranx_nodes(const char *log_file_name, } if (trace_level_ & kTraceDetail) - sql_print_information("%s: free all nodes back to free list", kWho); + sql_print_information("%s: cleared all nodes", kWho); } else if (new_front != trx_front_) { @@ -292,6 +292,7 @@ int ActiveTranx::clear_active_tranx_nodes(const char *log_file_name, while (curr_node != new_front) { next_node = curr_node->next_; + n_frees++; /* Remove the node from the hash table. */ unsigned int hash_val = get_hash_value(curr_node->log_name_, curr_node->log_pos_); @@ -312,7 +313,7 @@ int ActiveTranx::clear_active_tranx_nodes(const char *log_file_name, trx_front_ = new_front; if (trace_level_ & kTraceDetail) - sql_print_information("%s: free %d nodes back until pos (%s, %lu)", + sql_print_information("%s: cleared %d nodes back until pos (%s, %lu)", kWho, n_frees, trx_front_->log_name_, (unsigned long)trx_front_->log_pos_); } |