1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

MDEV-7908: assertion in innobase_release_savepoint

Browse Source 
Problem was that in XA prepared state we should still be able to
release a savepoint, but assertions were too strict.
This commit is contained in:
Jan Lindström 2015-04-06 17:38:51 +03:00
parent b53bcd438f
commit e9c10f9916
6 changed files with 44 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
mysql-test/suite/innodb/r/innodb-xa.result Normal file
View File

@ -0,0 +1,17 @@
xa rollback 'xid2';
ERROR XAE04: XAER_NOTA: Unknown XID
drop table if exists t1;
Warnings:
Note 1051 Unknown table 'test.t1'
create table t1(a int)engine=innodb;
rollback;
xa start 'xid2';
insert into `t1` values (1);
savepoint `sv1`;
xa end 'xid2';
start transaction;
ERROR XAE07: XAER_RMFAIL: The command cannot be executed when global transaction is in the IDLE state
xa prepare 'xid2';
release savepoint `sv1`;
xa commit 'xid2';
drop table t1;

17
mysql-test/suite/innodb/t/innodb-xa.test Normal file
View File

@ -0,0 +1,17 @@
--source include/have_innodb.inc
--disable_abort_on_error
xa rollback 'xid2';
drop table if exists t1;
create table t1(a int)engine=innodb;
rollback;
xa start 'xid2';
insert into `t1` values (1);
savepoint `sv1`;
xa end 'xid2';
start transaction;
xa prepare 'xid2';
release savepoint `sv1`;
xa commit 'xid2';
drop table t1;

5
storage/innobase/handler/ha_innodb.cc
View File

@ -4116,7 +4116,10 @@ innobase_release_savepoint(
DBUG_ASSERT(hton == innodb_hton_ptr);
trx = check_trx_exists(thd);
trx_start_if_not_started(trx);
if (trx->state == TRX_STATE_NOT_STARTED) {
trx_start_if_not_started(trx);
}
/* TODO: use provided savepoint data area to store savepoint data */

2
storage/innobase/trx/trx0roll.cc
View File

@ -495,7 +495,7 @@ trx_release_savepoint_for_mysql(
{
trx_named_savept_t* savep;
ut_ad(trx_state_eq(trx, TRX_STATE_ACTIVE));
ut_ad(trx_state_eq(trx, TRX_STATE_ACTIVE) || trx_state_eq(trx, TRX_STATE_PREPARED));
ut_ad(trx->in_mysql_trx_list);
savep = trx_savepoint_find(trx, savepoint_name);

5
storage/xtradb/handler/ha_innodb.cc
View File

@ -4679,7 +4679,10 @@ innobase_release_savepoint(
DBUG_ASSERT(hton == innodb_hton_ptr);
trx = check_trx_exists(thd);
trx_start_if_not_started(trx);
if (trx->state == TRX_STATE_NOT_STARTED) {
trx_start_if_not_started(trx);
}
/* TODO: use provided savepoint data area to store savepoint data */

2
storage/xtradb/trx/trx0roll.cc
View File

@ -492,7 +492,7 @@ trx_release_savepoint_for_mysql(
{
trx_named_savept_t* savep;
ut_ad(trx_state_eq(trx, TRX_STATE_ACTIVE));
ut_ad(trx_state_eq(trx, TRX_STATE_ACTIVE) || trx_state_eq(trx, TRX_STATE_PREPARED));
ut_ad(trx->in_mysql_trx_list);
savep = trx_savepoint_find(trx, savepoint_name);