diff --git a/sql/handler.cc b/sql/handler.cc
index b2acb262763..b61d28e035a 100644
--- a/sql/handler.cc
+++ b/sql/handler.cc
@@ -656,7 +656,7 @@ int ha_rollback_trans(THD *thd, THD_TRANS *trans)
     }
     thd->variables.tx_isolation=thd->session_tx_isolation;
     if (operation_done)
-      statistic_increment(ha_rollback_count,&LOCK_status);
+      statistic_increment(thd->status_var.ha_rollback_count,&LOCK_status);
     thd->proc_info= save_proc_info;
   }
 #endif /* USING_TRANSACTIONS */
diff --git a/sql/log_event.cc b/sql/log_event.cc
index 7fba19cb000..e8dc6a8827b 100644
--- a/sql/log_event.cc
+++ b/sql/log_event.cc
@@ -1362,7 +1362,8 @@ int Query_log_event::exec_event(struct st_relay_log_info* rli)
     Thank you.
   */
   thd->catalog= (char*) catalog;
-  thd->db= (char*) rewrite_db(db); // thd->db_length is set later if needed
+  thd->db_length= db_len;
+  thd->db= (char*) rewrite_db(db, &thd->db_length);
   thd->variables.auto_increment_increment= auto_increment_increment;
   thd->variables.auto_increment_offset=    auto_increment_offset;