bzr commit into mysql-5.1-rep-semisync branch (zhenxing.he:3124) Bug#49020

[He Zhenxing]

#At file:///media/sdb2/hezx/work/mysql/bzrwork/semisync/b49020/5.1-rep-semisync/ based on revid:zhenxing.he@stripped

 3124 He Zhenxing	2009-12-04
      Post fix for previous patch of Bug#49020
      
      Added back n_frees, use 'clear' instead of 'free' since memory is
      not freed here.
     @ plugin/semisync/semisync_master.cc
        Added back n_frees, use 'clear' instead of 'free' in the message since memory is not freed here.

    M  plugin/semisync/semisync_master.cc
=== modified file 'plugin/semisync/semisync_master.cc'
--- a/plugin/semisync/semisync_master.cc	2009-12-04 01:46:33 +0000
+++ b/plugin/semisync/semisync_master.cc	2009-12-04 05:43:38 +0000
@@ -280,7 +280,7 @@ int ActiveTranx::clear_active_tranx_node
     }
 
     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_node
     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_node
     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_);
   }


Attachment: [text/bzr-bundle] bzr/[e-mail]