Auto merge postfix of Bug#49020

He Zhenxing · He Zhenxing · commit b17c1a796156 · 2009-12-04T13:46:06.000+08:00
diff --git 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_);
   }

Original file line number	Diff line number	Diff line change
`@@ -280,7 +280,7 @@ int ActiveTranx::clear_active_tranx_nodes(const char *log_file_name,`
`280`	`280`	`}`
`281`	`281`
`282`	`282`	`if (trace_level_ & kTraceDetail)`
`283`		`- sql_print_information("%s: free all nodes back to free list", kWho);`
	`283`	`+ sql_print_information("%s: cleared all nodes", kWho);`
`284`	`284`	`}`
`285`	`285`	`else if (new_front != trx_front_)`
`286`	`286`	`{`
`@@ -292,6 +292,7 @@ int ActiveTranx::clear_active_tranx_nodes(const char *log_file_name,`
`292`	`292`	`while (curr_node != new_front)`
`293`	`293`	`{`
`294`	`294`	`next_node = curr_node->next_;`
	`295`	`+ n_frees++;`
`295`	`296`
`296`	`297`	`/* Remove the node from the hash table. */`
`297`	`298`	`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,`
`312`	`313`	`trx_front_ = new_front;`
`313`	`314`
`314`	`315`	`if (trace_level_ & kTraceDetail)`
`315`		`- sql_print_information("%s: free %d nodes back until pos (%s, %lu)",`
	`316`	`+ sql_print_information("%s: cleared %d nodes back until pos (%s, %lu)",`
`316`	`317`	`kWho, n_frees,`
`317`	`318`	`trx_front_->log_name_, (unsigned long)trx_front_->log_pos_);`
`318`	`319`	`}`