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

1 files changed, 2 insertions, 31 deletions

diff --git a/sql/handler.cc b/sql/handler.cc
index 1dba5b41e6f..888aa86088b 100644
--- a/sql/handler.cc
+++ b/sql/handler.cc
@@ -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;
@@ -3231,36 +3232,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.
 
   @sa handler::optimize()