database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-12-24 11:21:21 +03:00
Code Activity

mergin 5.1 -> rep+2 -> rep+3. create_table_from_dump issue will be merged on the next step

Browse Source
This commit is contained in:
Andrei Elkin
2009-11-30 20:20:26 +02:00
parent 558feaa208 3962da934f
commit 184d7b0250
348 changed files with 5797 additions and 4089 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
sql/handler.cc
View File

@@ -1331,7 +1331,8 @@ int ha_rollback_trans(THD *thd, bool all)
}
trans->ha_list= 0;
trans->no_2pc=0;
if (is_real_trans && thd->transaction_rollback_request)
if (is_real_trans && thd->transaction_rollback_request &&
thd->transaction.xid_state.xa_state != XA_NOTR)
thd->transaction.xid_state.rm_error= thd->main_da.sql_errno();
if (all)
thd->variables.tx_isolation=thd->session_tx_isolation;
@@ -3230,36 +3231,6 @@ handler::ha_reset_auto_increment(ulonglong value)
}
/**
Backup table: public interface.
@sa handler::backup()
*/
int
handler::ha_backup(THD* thd, HA_CHECK_OPT* check_opt)
{
mark_trx_read_write();
return backup(thd, check_opt);
}
/**
Restore table: public interface.
@sa handler::restore()
*/
int
handler::ha_restore(THD* thd, HA_CHECK_OPT* check_opt)
{
mark_trx_read_write();
return restore(thd, check_opt);
}
/**
Optimize table: public interface.