database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-31 22:22:30 +03:00
Code Activity

sql/handler.cc

Browse Source 
smarter xid-to-str routiine
    fixed assert crash in XA RECOVER
sql/sql_parse.cc
    XA COMMIT/ROLLBACK did not send_ok in some cases


sql/handler.cc:
  smarter xid-to-str routiine
  fixed assert crash in XA RECOVER
sql/sql_parse.cc:
  XA COMMIT/ROLLBACK did not send_ok in some cases
This commit is contained in:
unknown
2005-03-16 08:42:06 +01:00
parent 232dc9221d
commit 5cb5a11bdd
2 changed files with 24 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
sql/sql_parse.cc
View File

@@ -4382,6 +4382,8 @@ unsent_create_error:
{
if (!(res= !ha_commit_or_rollback_by_xid(&thd->lex->ident, 1)))
my_error(ER_XAER_NOTA, MYF(0));
else
send_ok(thd);
break;
}
if (thd->transaction.xa_state == XA_IDLE && thd->lex->xa_opt == XA_ONE_PHASE)
@@ -4390,9 +4392,7 @@ unsent_create_error:
if ((r= ha_commit(thd)))
my_error(r == 1 ? ER_XA_RBROLLBACK : ER_XAER_RMERR, MYF(0));
else
{
send_ok(thd);
}
}
else
if (thd->transaction.xa_state == XA_PREPARED && thd->lex->xa_opt == XA_NONE)
@@ -4400,9 +4400,7 @@ unsent_create_error:
if (ha_commit_one_phase(thd, 1))
my_error(ER_XAER_RMERR, MYF(0));
else
{
send_ok(thd);
}
}
else
{
@@ -4419,6 +4417,8 @@ unsent_create_error:
{
if (!(res= !ha_commit_or_rollback_by_xid(&thd->lex->ident, 0)))
my_error(ER_XAER_NOTA, MYF(0));
else
send_ok(thd);
break;
}
if (thd->transaction.xa_state != XA_IDLE &&