mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-31 02:51:44 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Build fixes to make it compile.

Browse source
This commit is contained in:
pem@mysql.comhem.se 2004-11-12 11:37:59 +01:00
parent 1d8a6a06a5
commit b95560a8fc
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
sql/handler.cc
View file

@ -656,7 +656,7 @@ int ha_rollback_trans(THD *thd, THD_TRANS *trans)
} }
thd->variables.tx_isolation=thd->session_tx_isolation; thd->variables.tx_isolation=thd->session_tx_isolation;
if (operation_done) 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; thd->proc_info= save_proc_info;
} }
#endif /* USING_TRANSACTIONS */ #endif /* USING_TRANSACTIONS */

3
sql/log_event.cc
View file

@ -1362,7 +1362,8 @@ int Query_log_event::exec_event(struct st_relay_log_info* rli)
Thank you. Thank you.
*/ */
thd->catalog= (char*) catalog; 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_increment= auto_increment_increment;
thd->variables.auto_increment_offset= auto_increment_offset; thd->variables.auto_increment_offset= auto_increment_offset;