Build fixes to make it compile.

b95560a8 · pem@mysql.comhem.se · 1d8a6a06 · b95560a8 · b95560a8
Commit b95560a8 authored Nov 12, 2004 by pem@mysql.comhem.se
Show whitespace changes
Inline Side-by-side

Showing with 3 additions and 2 deletions

sql/handler.cc sql/handler.cc +1 -1

sql/log_event.cc sql/log_event.cc +2 -1

No files found.
--- 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 */

--- 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;