Commit 2bf160b0 authored by Davi Arnaut's avatar Davi Arnaut
Browse files

Merge from mysql-5.1-5.1.29-rc into mysql-5.1-bugteam

parents 8fe1cce5 dc324e86

mysql-test/r/xa.result

+20 −0
Original line number Diff line number Diff line
@@ -55,3 +55,23 @@ select * from t1; 
a

20

drop table t1;

drop table if exists t1;

create table t1(a int, b int, c varchar(20), primary key(a)) engine = innodb;

insert into t1 values(1, 1, 'a');

insert into t1 values(2, 2, 'b');

xa start 'a','b';

update t1 set c = 'aa' where a = 1;

xa start 'a','c';

update t1 set c = 'bb' where a = 2;

update t1 set c = 'bb' where a = 2;

update t1 set c = 'aa' where a = 1;

ERROR 40001: Deadlock found when trying to get lock; try restarting transaction

select count(*) from t1;

count(*)

2

xa end 'a','c';

ERROR XA102: XA_RBDEADLOCK: Transaction branch was rolled back: deadlock was detected

xa rollback 'a','c';

xa start 'a','c';

drop table t1;

End of 5.0 tests

mysql-test/t/xa.test

+45 −0
Original line number Diff line number Diff line
@@ -74,3 +74,48 @@ xa start 'zzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz'; 
select * from t1;

drop table t1;



disconnect con1;



#

# Bug#28323: Server crashed in xid cache operations

#



--disable_warnings

drop table if exists t1;

--enable_warnings



create table t1(a int, b int, c varchar(20), primary key(a)) engine = innodb;

insert into t1 values(1, 1, 'a');

insert into t1 values(2, 2, 'b');



connect (con1,localhost,root,,);

connect (con2,localhost,root,,);



--connection con1

xa start 'a','b';

update t1 set c = 'aa' where a = 1;

--connection con2

xa start 'a','c';

update t1 set c = 'bb' where a = 2;

--connection con1

--send update t1 set c = 'bb' where a = 2

--connection con2

--sleep 1

--error ER_LOCK_DEADLOCK

update t1 set c = 'aa' where a = 1;

select count(*) from t1;

--error ER_XA_RBDEADLOCK

xa end 'a','c';

xa rollback 'a','c';

--disconnect con2



connect (con3,localhost,root,,);

--connection con3

xa start 'a','c';



--disconnect con1

--disconnect con3

--connection default

drop table t1;



--echo End of 5.0 tests

sql/handler.cc

+6 −1
Original line number Diff line number Diff line
@@ -1278,7 +1278,12 @@ int ha_rollback_trans(THD *thd, bool all) 
    trans->ha_list= 0;

    trans->no_2pc=0;

    if (is_real_trans)

    {

      if (thd->transaction_rollback_request)

        thd->transaction.xid_state.rm_error= thd->main_da.sql_errno();

      else

        thd->transaction.xid_state.xid.null();

    }

    if (all)

    {

      thd->variables.tx_isolation=thd->session_tx_isolation;

sql/share/errmsg.txt

+6 −0
Original line number Diff line number Diff line
@@ -6128,6 +6128,12 @@ ER_LOAD_DATA_INVALID_COLUMN 
ER_LOG_PURGE_NO_FILE  

	eng "Being purged log %s was not found"



ER_XA_RBTIMEOUT XA106

	eng "XA_RBTIMEOUT: Transaction branch was rolled back: took too long"



ER_XA_RBDEADLOCK XA102

	eng "XA_RBDEADLOCK: Transaction branch was rolled back: deadlock was detected"



ER_NEED_REPREPARE

  eng "Prepared statement needs to be re-prepared"

sql/sql_class.h

+3 −1
Original line number Diff line number Diff line
@@ -739,7 +739,7 @@ struct st_savepoint { 
  Ha_trx_info         *ha_list;

};



enum xa_states {XA_NOTR=0, XA_ACTIVE, XA_IDLE, XA_PREPARED};

enum xa_states {XA_NOTR=0, XA_ACTIVE, XA_IDLE, XA_PREPARED, XA_ROLLBACK_ONLY};

extern const char *xa_state_names[];



typedef struct st_xid_state {
@@ -747,6 +747,8 @@ typedef struct st_xid_state { 
  XID  xid;                           // transaction identifier

  enum xa_states xa_state;            // used by external XA only

  bool in_thd;

  /* Error reported by the Resource Manager (RM) to the Transaction Manager. */

  uint rm_error;

} XID_STATE;



extern pthread_mutex_t LOCK_xid_cache;